GTK 3.22: fix parsing errors

7 files changed, 37 insertions, 32 deletions

diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index 3bd8448..de316cd 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -572,7 +572,7 @@ button.documents-favorite:active:hover {
     border: 1px solid rgba(0, 0, 0, 0.35);
     border-radius: 3px;
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
-    background-image: linear-gradient(to bottom, white);
+    background-image: _solid(white);
     background-color: transparent;
 
   .title, .label {
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index fa080ee..08e1160 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1096,7 +1096,7 @@ headerbar {
     }
   }
 
-  > separator { background-image: linear-gradient(to top, $header_border); }
+  > separator { background-image: _solid($header_border); }
 
   @extend %titlebar;
 }
@@ -1474,17 +1474,17 @@ treeview.view {
   &.progressbar, &.progressbar:focus { // progress bar in treeviews
     color: $selected_fg_color;
     border-radius: 3px;
-    background-image: linear-gradient(to bottom, $selected_bg_color);
+    background-color: $selected_bg_color;
 
     &:selected, &:selected:focus {
       color: $selected_bg_color;
       box-shadow: none;
-      background-image: linear-gradient(to bottom, $selected_fg_color);
+      background-color: $selected_fg_color;
     }
   }
   &.trough, &.trough:selected, &.trough:selected:focus { // progress bar trough in treeviews
     color: $fg_color;
-    background-image: linear-gradient(to bottom, $button_border);
+    background-color: $button_border;
     border-radius: 3px;
     border-width: 0;
   }
@@ -1937,7 +1937,7 @@ scrollbar {
 // Switches
 //
 switch {
-  font: 1;
+  font-size: 1px;
 
   min-width: 52px;
   min-height: 24px;
@@ -2681,7 +2681,7 @@ placessidebar {
     &.sidebar-placeholder-row {
       padding: 0 8px;
       min-height: 2px;
-      background-image: linear-gradient(to top, $drop_target_color);
+      background-image: _solid($drop_target_color);
       background-clip: content-box;
     }
 
@@ -2731,16 +2731,16 @@ paned {
     -gtk-icon-source: none;
     border-style: none;
     background-color: transparent;
-    background-image: linear-gradient(to top, $borders_color);
+    background-image: _solid($borders_color);
     background-size: 1px 1px;
 
-    &:selected { background-image: linear-gradient(to top, $selected_bg_color); }
+    &:selected { background-image: _solid($selected_bg_color); }
 
     &.wide {
       min-width: 5px;
       min-height: 5px;
       background-color: $bg_color;
-      background-image: linear-gradient(to top, $borders_color), linear-gradient(to top, $borders_color);
+      background-image: _solid($borders_color), _solid($borders_color);
       background-size: 1px 1px, 1px 1px;
     }
   }
@@ -2997,7 +2997,7 @@ colorchooser .popover.osd { border-radius: 3px; }
 
 // Decouple the font of context menus from their entry/textview
 .context-menu { font: initial; }
-.monospace { font: Monospace; }
+.monospace { font-family: Monospace; }
 
 //
 // Shortcuts Help
diff --git a/common/gtk-3.0/3.20/sass/_drawing.scss b/common/gtk-3.0/3.20/sass/_drawing.scss
index 43190a3..7bbd93a 100644
--- a/common/gtk-3.0/3.20/sass/_drawing.scss
+++ b/common/gtk-3.0/3.20/sass/_drawing.scss
@@ -1,5 +1,10 @@
 // Drawing mixins
 
+// Solid color image
+@function _solid($c) {
+  @return linear-gradient(to bottom, $c, $c);
+}
+
 // Entries
 
 @mixin entry($t) {
diff --git a/common/gtk-3.0/3.20/sass/_granite.scss b/common/gtk-3.0/3.20/sass/_granite.scss
index a491d31..a564d55 100644
--- a/common/gtk-3.0/3.20/sass/_granite.scss
+++ b/common/gtk-3.0/3.20/sass/_granite.scss
@@ -151,7 +151,7 @@ GraniteWidgetsWelcome {
 
 GraniteWidgetsWelcome label {
   color: mix($fg_color, $bg_color, 50%);
-  font: open sans 11;
+  font-size: 11px;
   text-shadow: none;
 }
 
@@ -182,7 +182,7 @@ GraniteWidgetsPopOver {
 }
 
 .popover_bg {
-  background-image: linear-gradient(to bottom, $base_color);
+  background-image: _solid($base_color);
   border: 1px solid transparentize(black, 0.7);
 }
 
@@ -199,9 +199,9 @@ GraniteWidgetsXsEntry entry { padding: 4px; }
 //
 // Text Styles
 //
-.h1 { font: open sans 24px; }
-.h2 { font: open sans light 18px; }
-.h3 { font: open sans 11px; }
+.h1 { font-size: 24px; }
+.h2 { font-size: 18px; }
+.h3 { font-size: 11px; }
 .h4,
 .category-label {
     color: mix($bg_color, $text_color, 30%);
diff --git a/common/gtk-3.0/3.20/sass/_lightdm.scss b/common/gtk-3.0/3.20/sass/_lightdm.scss
index e5e5530..0b91ff2 100644
--- a/common/gtk-3.0/3.20/sass/_lightdm.scss
+++ b/common/gtk-3.0/3.20/sass/_lightdm.scss
@@ -2,7 +2,7 @@
 #panel_window {
   background-color: $panel_bg;
   color: $panel_fg;
-  font: bold;
+  font-weight: bold;
   box-shadow: inset 0 -1px darken($panel_bg, 7%);
 
   // the menubars/menus of the panel, i.e. indicators
@@ -10,7 +10,7 @@
   menubar > menuitem {
     background-color: transparent;
     color: $panel_fg;
-    font: bold;
+    font-weight: bold;
   }
 
   menubar menuitem:disabled {
@@ -18,14 +18,14 @@
 
     label { color: inherit; }
   }
-  menubar menu > menuitem { font: normal; }
+  menubar menu > menuitem { font-weight: normal; }
 }
 
 // the login window
 #login_window,
 #shutdown_dialog,
 #restart_dialog {
-  font: normal;
+  font-weight: normal;
   border-style: none;
   background-color: transparent;
   color: $fg_color;
@@ -72,9 +72,9 @@
 
 #login_window #user_combobox {
   color: $fg_color;
-  font: 13px;
+  font-size: 13px;
 
-  menu { font: normal; }
+  menu { font-weight: normal; }
 }
 
 // the user's avatar box
@@ -102,5 +102,5 @@
 // the warning, in case a wrong password is entered or something else goes wrong according to PAM
 #greeter_infobar {
   border-bottom-width: 0;
-  font: bold;
+  font-weight: bold;
 }
diff --git a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
index f6966a5..2b59744 100644
--- a/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.20/sass/_transparent_widgets.scss
@@ -3,7 +3,7 @@
 //.nemo-window,
 .nautilus-window {
   paned > separator {
-    background-image: linear-gradient(to top, $dark_sidebar_border);
+    background-image: _solid($dark_sidebar_border);
 
     @if $variant=='light' {
       &:dir(ltr) { margin-left: -1px; }
@@ -12,7 +12,7 @@
   }
 }
 
-filechooser paned > separator { background-image: linear-gradient(to top, $dark_sidebar_border); }
+filechooser paned > separator { background-image: _solid($dark_sidebar_border); }
 
 // Dark transparent sidebars
 filechooser,
@@ -145,8 +145,8 @@ filechooser {
 // Gedit
 .gedit-bottom-panel-paned { background-color: $base_color; }
 
-.gedit-side-panel-paned > separator { background-image: linear-gradient(to top, $dark_sidebar_border); }
-.gedit-bottom-panel-paned > separator { background-image: linear-gradient(to top, $borders_color); }
+.gedit-side-panel-paned > separator { background-image: _solid($dark_sidebar_border); }
+.gedit-bottom-panel-paned > separator { background-image: _solid($borders_color); }
 
 .gedit-document-panel {
   background-color: $dark_sidebar_bg;
diff --git a/common/gtk-3.0/3.20/sass/_unity.scss b/common/gtk-3.0/3.20/sass/_unity.scss
index f83e73c..b851ec9 100644
--- a/common/gtk-3.0/3.20/sass/_unity.scss
+++ b/common/gtk-3.0/3.20/sass/_unity.scss
@@ -23,28 +23,28 @@ UnityDecoration {
     border-radius: 4px 4px 0 0;
     padding: 1px 6px 0 6px;
 
-    background-image: linear-gradient(to bottom, opacify($header_bg, 1));
+    background-image: _solid(opacify($header_bg, 1));
     color: $header_fg;                         // The foreground color will be used to paint the text
 
     box-shadow: inset 0  1px lighten($header_bg, 3%);
 
     &:backdrop {
       border-bottom-width: 0;
-      //background-image: linear-gradient(to bottom, opacify($header_bg_backdrop, 1));
+      //background-image: _solid(opacify($header_bg_backdrop, 1));
       color: transparentize($header_fg, 0.3);
     }
   }
   &.left, &.right, &.bottom,
   &.left:backdrop, &.right:backdrop, &.bottom:backdrop {
     background-color: transparent;
-    background-image: linear-gradient(to bottom, if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), transparentize(black, 0.9)));
+    background-image: _solid(if($darker=='true' or $variant == 'dark', darken($header_bg, 7%), transparentize(black, 0.9)));
   }
 }
 
 // Panel Style
 UnityPanelWidget,
 .unity-panel {
-  background-image: linear-gradient(to bottom, #2f343f);
+  background-image: _solid(#2f343f);
   color: lighten($panel_fg, 20%);
   box-shadow: none;
 
@@ -55,7 +55,7 @@ UnityPanelWidget,
 .unity-panel.menubar .menuitem *:hover {
   border-radius: 0;
   color: $selected_fg_color;
-  background-image: linear-gradient(to bottom, $selected_bg_color);
+  background-image: _solid($selected_bg_color);
   border-bottom: none;
 }