[gtk+] Adwaita: Fix use of font: shorthand

[Matthias Clasen <matthiasc src gnome org>]

commit df22f3017bbe5c4ff24565862d3a2204f0869be8
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Apr 18 11:45:55 2016 -0400

    Adwaita: Fix use of font: shorthand

 gtk/theme/Adwaita/_common.scss           |    2 +-
 gtk/theme/Adwaita/gtk-contained-dark.css |   34 +++++++++++++++--------------
 gtk/theme/Adwaita/gtk-contained.css      |   34 +++++++++++++++--------------
 3 files changed, 37 insertions(+), 33 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 3b4997a..e262db5 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4219,7 +4219,7 @@ headerbar.selection-mode button.titlebutton,
   }
 }
 
-.monospace { font: Monospace; }
+.monospace { font-family: monospace; }
 
 
 /**********************
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 7472ecb..333687a 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -141,7 +141,8 @@ assistant .sidebar label.highlight {
   background-color: #5d6262; }
 
 .csd popover.background.touch-selection, .csd popover.background.magnifier, 
popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, 
popover.background.osd, .app-notification,
-.app-notification.frame, .osd .scale-popup, .osd {
+.app-notification.frame, .osd .scale-popup,
+.osd {
   color: #eeeeec;
   border: none;
   background-color: rgba(32, 37, 38, 0.8);
@@ -149,7 +150,8 @@ assistant .sidebar label.highlight {
   outline-color: rgba(238, 238, 236, 0.3);
   text-shadow: 0 1px black;
   -gtk-icon-shadow: 0 1px black; }
-  popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, 
popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop {
+  popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, 
popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop,
+  .osd:backdrop {
     text-shadow: none;
     -gtk-icon-shadow: none; }
 
@@ -1680,9 +1682,9 @@ headerbar {
     transition: 200ms ease-out; }
   .titlebar:not(headerbar) .title,
   headerbar .title {
-    font-weight: bold;
     padding-left: 12px;
-    padding-right: 12px; }
+    padding-right: 12px;
+    font-weight: bold; }
   .titlebar:not(headerbar) .subtitle,
   headerbar .subtitle {
     font-size: smaller;
@@ -1691,8 +1693,8 @@ headerbar {
   .selection-mode.titlebar:not(headerbar),
   headerbar.selection-mode {
     color: #ffffff;
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #0f2b48;
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     background-image: linear-gradient(to top, #1e5690, #205b98 2px, #215d9c 3px);
     background-color: #215d9c;
     box-shadow: inset 0 1px rgba(40, 98, 159, 0.535); }
@@ -1931,8 +1933,8 @@ headerbar {
     border-radius: 0; }
   .default-decoration.titlebar:not(headerbar),
   headerbar.default-decoration {
-    padding: 4px;
-    min-height: 28px; }
+    min-height: 28px;
+    padding: 4px; }
     .default-decoration.titlebar:not(headerbar) button.titlebutton,
     headerbar.default-decoration button.titlebutton {
       min-height: 26px;
@@ -2097,29 +2099,29 @@ treeview.view {
   treeview.view header.button.dnd:hover,
   treeview.view header.button.dnd {
     padding: 0 6px;
-    transition: none;
+    color: #292929;
     background-image: none;
     background-color: #215d9c;
-    color: #292929;
-    border-radius: 0;
     border-style: none;
+    border-radius: 0;
     box-shadow: inset 0 0 0 1px #292929;
-    text-shadow: none; }
+    text-shadow: none;
+    transition: none; }
 
 treeview.view header button, treeview.view header button:hover, treeview.view header button:active {
   padding: 0 6px;
-  border-radius: 0;
   background-image: none;
-  text-shadow: none;
   border-style: none solid solid none;
-  border-color: #393f3f; }
+  border-color: #393f3f;
+  border-radius: 0;
+  text-shadow: none; }
   treeview.view header button:disabled {
     border-color: #393f3f;
     background-image: none; }
   treeview.view header button:backdrop {
+    color: #676b6b;
     border-color: #393f3f;
     border-style: none solid solid none;
-    color: #676b6b;
     background-image: none;
     background-color: #2c2c2c; }
     treeview.view header button:backdrop:disabled {
@@ -4467,7 +4469,7 @@ popover.background radiobutton:selected,
         color: #5781ad; }
 
 .monospace {
-  font: Monospace; }
+  font-family: monospace; }
 
 /**********************
  * Touch Copy & Paste *
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 8539fa1..aa185cd 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -141,7 +141,8 @@ assistant .sidebar label.highlight {
   background-color: #c3c4c4; }
 
 .csd popover.background.touch-selection, .csd popover.background.magnifier, 
popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, 
popover.background.osd, .app-notification,
-.app-notification.frame, .osd .scale-popup, .osd {
+.app-notification.frame, .osd .scale-popup,
+.osd {
   color: #eeeeec;
   border: none;
   background-color: rgba(32, 37, 38, 0.8);
@@ -149,7 +150,8 @@ assistant .sidebar label.highlight {
   outline-color: rgba(238, 238, 236, 0.3);
   text-shadow: 0 1px black;
   -gtk-icon-shadow: 0 1px black; }
-  popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, 
popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop, .osd:backdrop {
+  popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, 
popover.background.osd:backdrop, .app-notification:backdrop, .osd .scale-popup:backdrop,
+  .osd:backdrop {
     text-shadow: none;
     -gtk-icon-shadow: none; }
 
@@ -1687,9 +1689,9 @@ headerbar {
     transition: 200ms ease-out; }
   .titlebar:not(headerbar) .title,
   headerbar .title {
-    font-weight: bold;
     padding-left: 12px;
-    padding-right: 12px; }
+    padding-right: 12px;
+    font-weight: bold; }
   .titlebar:not(headerbar) .subtitle,
   headerbar .subtitle {
     font-size: smaller;
@@ -1698,8 +1700,8 @@ headerbar {
   .selection-mode.titlebar:not(headerbar),
   headerbar.selection-mode {
     color: #ffffff;
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     border-color: #184472;
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     background-image: linear-gradient(to top, #276fba, #428bd7 2px, #4a90d9 3px);
     background-color: #4a90d9;
     box-shadow: inset 0 1px rgba(146, 188, 232, 0.9); }
@@ -1938,8 +1940,8 @@ headerbar {
     border-radius: 0; }
   .default-decoration.titlebar:not(headerbar),
   headerbar.default-decoration {
-    padding: 4px;
-    min-height: 28px; }
+    min-height: 28px;
+    padding: 4px; }
     .default-decoration.titlebar:not(headerbar) button.titlebutton,
     headerbar.default-decoration button.titlebutton {
       min-height: 26px;
@@ -2110,29 +2112,29 @@ treeview.view {
   treeview.view header.button.dnd:hover,
   treeview.view header.button.dnd {
     padding: 0 6px;
-    transition: none;
+    color: #ffffff;
     background-image: none;
     background-color: #4a90d9;
-    color: #ffffff;
-    border-radius: 0;
     border-style: none;
+    border-radius: 0;
     box-shadow: inset 0 0 0 1px #ffffff;
-    text-shadow: none; }
+    text-shadow: none;
+    transition: none; }
 
 treeview.view header button, treeview.view header button:hover, treeview.view header button:active {
   padding: 0 6px;
-  border-radius: 0;
   background-image: none;
-  text-shadow: none;
   border-style: none solid solid none;
-  border-color: #e8e8e7; }
+  border-color: #e8e8e7;
+  border-radius: 0;
+  text-shadow: none; }
   treeview.view header button:disabled {
     border-color: #e8e8e7;
     background-image: none; }
   treeview.view header button:backdrop {
+    color: #babbbb;
     border-color: #e8e8e7;
     border-style: none solid solid none;
-    color: #babbbb;
     background-image: none;
     background-color: #fcfcfc; }
     treeview.view header button:backdrop:disabled {
@@ -4497,7 +4499,7 @@ popover.background radiobutton:selected,
         color: #7fb0e4; }
 
 .monospace {
-  font: Monospace; }
+  font-family: monospace; }
 
 /**********************
  * Touch Copy & Paste *