Update to GTK 3.22.2

README.md

@@ -7,6 +7,7 @@ Reduce ugly padding from gnome default theme, Adwaita, to make it more compact a
 ![alt text](preview-3.png "Preview 3")
 
 ## Download
+ * [3.22.0](https://github.com/polter-rnd/adwaita-compact/archive/v3.22.0.tar.gz)
  * [3.20.9.1](https://github.com/abihf/adwaita-compact/archive/v3.20.9.1.tar.gz)
  * [3.20.0.1](https://github.com/abihf/adwaita-compact/archive/v3.20.0.1.tar.gz)
  * [3.16.2.1](https://github.com/abihf/adwaita-compact/archive/3.16.2.1.tar.gz)

gnome-shell/_common.scss

@@ -27,7 +27,7 @@ $panel-corner-radius: 0;
 
 
 /* GLOBALS */
-$font-size: 9;
+$font-size: 11;
 $font-family: Cantarell, Sans-Serif;
 $_bubble_bg_color: opacify($osd_bg_color,0.25);
 $_bubble_fg_color: $osd_fg_color;

gnome-shell/gnome-shell.css

@@ -20,7 +20,7 @@
 /* GLOBALS */
 stage {
   font-family: Cantarell, Sans-Serif;
-  font-size: 9pt;
+  font-size: 11pt;
   color: #eeeeec; }
 
 /* WIDGETS */

gtk-2.0/main.rc

@@ -1045,9 +1045,8 @@ style "default" {
     # Scales #
     ##########
 
-    # Troughs
-    # They are overrided later on
-    # We set them here too because some widgets don't specify their orientation
+    # Troughs, overrided later on. We set them here too because some widgets
+    # don't specify their orientation.
 
     image {
       function    = BOX
@@ -2028,9 +2027,10 @@ style "combobox_entry" {
 
 style "combo_button_padding" {
 
-  # Since one side of the button is missing, we need to shift the arrow a little to the right
+  # Since one side of the button is missing, we need to shift the arrow a
+  # little to the right.
   # This is the same thing we've done above but the combo, unlike the combobox,
-  # uses padding the same way as a button
+  # uses padding the same way as a button.
   GtkButton::inner-border = {6, 8, 4, 4}
 
 }
@@ -2470,80 +2470,91 @@ style "disable_separator" {
 
 }
 
-# Default style, containing most of the stuff
-class "GtkWidget"            style "default"
-
-# Override padding,          style and colour
-class "GtkButton"            style "button"
-class "GtkLinkButton"        style "link_button"
-class "GtkEntry"             style "entry"
-class "GtkOldEditable"       style "entry"
-class "GtkNotebook"          style "notebook"
-class "GtkHScale"            style "scale_horz"
-class "GtkVScale"            style "scale_vert"
-class "GtkProgressBar"       style "progressbar"
-class "GtkScrolledWindow"    style "scrolled_window"
-class "GtkFrame"             style "frame"
-class "GtkSeparatorToolItem" style "toolbar_separator"
-class "GtkMenuBar"           style "menubar"
-class "GtkMenu"              style "menu"
-class "GtkTextView"          style "textview"
+# Default style, containing theme properties and trying to match every widget as
+# much as possible, which is not only faster than trying to match every widget
+# by its own but also less bug-prune and more consistent. However there is some
+# widget specific stuff that needs to be taken care of, which is the point of
+# every other style below.
+class "GtkWidget" style "default"
+
+ ######################################
+ # Override padding, style and colour #
+ ######################################
+
+class "GtkButton"                                                  style "button"
+class "GtkLinkButton"                                              style "link_button"
+class "GtkEntry"                                                   style "entry"
+class "GtkOldEditable"                                             style "entry"
+class "GtkNotebook"                                                style "notebook"
+class "GtkHScale"                                                  style "scale_horz"
+class "GtkVScale"                                                  style "scale_vert"
+class "GtkProgressBar"                                             style "progressbar"
+class "GtkScrolledWindow"                                          style "scrolled_window"
+class "GtkFrame"                                                   style "frame"
+class "GtkSeparatorToolItem"                                       style "toolbar_separator"
+class "GtkMenuBar"                                                 style "menubar"
+class "GtkMenu"                                                    style "menu"
+class "GtkTextView"                                                style "textview"
 
 # Menu and menubar items
-widget_class "*<GtkMenuItem>*"              style "menu_item"
-widget_class "*<GtkMenuBar>.<GtkMenuItem>*" style "menubar_item"
-widget_class "*<GtkSeparatorMenuItem>*"     style "separator_menu_item"
+widget_class "*<GtkMenuItem>*"                                     style "menu_item"
+widget_class "*<GtkMenuBar>.<GtkMenuItem>*"                        style "menubar_item"
+widget_class "*<GtkSeparatorMenuItem>*"                            style "separator_menu_item"
 
 # Frames in statusbars look ugly, let's disable them
-widget_class "*<GtkStatusbar>*<GtkFrame>" style "disable_shadow"
+widget_class "*<GtkStatusbar>*<GtkFrame>"                          style "disable_shadow"
 # Disable the frame around poor Wilbert too
-widget_class "*<GimpToolbox>*<GtkFrame>"  style "disable_shadow"
+widget_class "*<GimpToolbox>*<GtkFrame>"                           style "disable_shadow"
 
 # Treeview buttons
-widget_class "*<GtkTreeView>*<GtkButton>*" style "treeview_header"
+widget_class "*<GtkTreeView>*<GtkButton>*"                         style "treeview_header"
 
 # Give the file chooser toolbar a border
-widget_class "*<GtkFileChooserDefault>*<GtkToolbar>" style "inline_toolbar"
+widget_class "*<GtkFileChooserDefault>*<GtkToolbar>"               style "inline_toolbar"
 
 # Fix padding on regular comboboxes
-widget_class "*<GtkComboBox>.<GtkButton>" style "combobox"
+widget_class "*<GtkComboBox>.<GtkButton>"                          style "combobox"
 # And disable separators on them
-widget_class "*<GtkComboBox>.<GtkButton>*<GtkSeparator>" style "disable_separator"
+widget_class "*<GtkComboBox>.<GtkButton>*<GtkSeparator>"           style "disable_separator"
 
 # Join together the ComboBoxEntry entry and button
-widget_class "*<GtkComboBoxEntry>*"  style "combobox_entry"
+widget_class "*<GtkComboBoxEntry>*"                                style "combobox_entry"
 
 # Join the Combo entry and button
-widget_class "*<GtkCombo>*"  style "combobox_entry"
-# Tweak the padding on the button a little bit because it uses it a bit differently
-widget_class "*<GtkCombo>.<GtkButton>" style "combo_button_padding"
+widget_class "*<GtkCombo>*"                                        style "combobox_entry"
+# Tweak the padding on the button a little bit because it
+# uses it a bit differently
+widget_class "*<GtkCombo>.<GtkButton>"                             style "combo_button_padding"
 
-# Alas we cannot do the same for ComboBoxText because there isn't a way to apply the style to only
-# the comboboxes that have an entry inside
+# Alas we cannot do the same for ComboBoxText because there
+# isn't a way to apply the style to only the comboboxes that
+# have an entry inside
 
 # Toolbar buttons have different paddings
-widget_class "*<GtkToolbar>*<GtkButton>" style "toolbar_button"
+widget_class "*<GtkToolbar>*<GtkButton>"                           style "toolbar_button"
 
 # Notebooks are white, act accordingly
-widget_class "*<GtkNotebook>*<GtkEntry>"                        style "notebook_entry"
-widget_class "*<GtkNotebook>*<GtkProgressBar>"                  style "notebook_bg"
-widget_class "*<GtkNotebook>*<GtkSpinButton>"                   style "notebook_bg"
-widget_class "*<GtkNotebook>*<GtkScrolledWindow>*<GtkViewport>" style "notebook_bg"
-widget_class "*<GtkNotebook>*<GimpRuler>"                       style "notebook_bg"
-widget_class "*<GtkNotebook>.<GimpDisplayShell>*<GtkEventBox>"  style "notebook_bg"
-widget_class "*<GtkNotebook>*<GtkComboBoxEntry>*"               style "notebook_combo"
-widget_class "*<GtkNotebook>*<GtkCombo>*"                       style "notebook_combo"
-
-# However, stuff inside eventboxes inside notebooks is grey again, react
+widget_class "*<GtkNotebook>*<GtkEntry>"                           style "notebook_entry"
+widget_class "*<GtkNotebook>*<GtkProgressBar>"                     style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkSpinButton>"                      style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkScrolledWindow>*<GtkViewport>"    style "notebook_bg"
+widget_class "*<GtkNotebook>*<GimpRuler>"                          style "notebook_bg"
+widget_class "*<GtkNotebook>.<GimpDisplayShell>*<GtkEventBox>"     style "notebook_bg"
+widget_class "*<GtkNotebook>*<GtkComboBoxEntry>*"                  style "notebook_combo"
+widget_class "*<GtkNotebook>*<GtkCombo>*"                          style "notebook_combo"
+
+# However, stuff inside eventboxes inside notebooks is grey
+# again, react
 widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkEntry>"             style "normal_entry"
 widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkProgressBar>"       style "normal_bg"
 widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkSpinButton>"        style "normal_bg"
 widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkComboBoxEntry>*"    style "combobox_entry"
 widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkCombo>*"            style "combobox_entry"
 widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkCombo>.<GtkButton>" style "combo_button_padding"
 
-# ComboBoxes tend to draw the button label with text[] instead of fg[], we need to fix that
-widget_class "*<GtkComboBox>*<GtkCellView>" style "combobox_cellview"
+# ComboBoxes tend to draw the button label with text[]
+# instead of fg[], we need to fix that
+widget_class "*<GtkComboBox>*<GtkCellView>"                        style "combobox_cellview"
 
 # GTK tooltips
-widget "gtk-tooltip*" style "tooltip"
+widget "gtk-tooltip*"                                              style "tooltip"

gtk-3.0/_colors-public.scss

@@ -65,6 +65,10 @@ base background color of selections on backdrop windows */
 text/foreground color of selections on backdrop windows */
 @define-color theme_unfocused_selected_fg_color #{"" + $selected_fg_color};
 
+/*
+insensitive color on backdrop windows*/
+@define-color unfocused_insensitive_color #{"" + $backdrop_insensitive_color};
+
 /*
 widgets main borders color */
 @define-color borders #{"" +$borders_color};

gtk-3.0/_colors.scss

@@ -4,18 +4,19 @@
 
 $base_color: if($variant == 'light', #ffffff, #232729);
 $text_color: if($variant == 'light', black, white);
-$bg_color: if($variant == 'light', #f5f5f4, #33393b);
+$bg_color: if($variant == 'light', #e8e8e7, #33393b);
 $fg_color: if($variant == 'light', #2e3436, #eeeeec);
 
 $selected_fg_color: #ffffff;
-$selected_bg_color: if($variant == 'light', #4a90d9, darken(#4a90d9,20%));
+$selected_bg_color: if($variant == 'light', #4a90d9, darken(#4a90d9, 20%));
 $selected_borders_color: if($variant== 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));
-$borders_color: if($variant == 'light', darken($bg_color,30%), darken($bg_color,12%));
+$borders_color: if($variant == 'light', darken($bg_color, 20%), darken($bg_color, 10%));
+$alt_borders_color: if($variant == 'light', darken($bg_color, 35%), darken($bg_color, 17%));
 $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
-$link_color: if($variant == 'light', darken($selected_bg_color,10%), lighten($selected_bg_color,20%));
-$link_visited_color: if($variant == 'light', darken($selected_bg_color,20%), lighten($selected_bg_color,10%));
+$link_color: if($variant == 'light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 20%));
+$link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), lighten($selected_bg_color, 10%));
 $top_hilight: $borders_edge;
-$dark_fill: mix($borders_color, $bg_color, 35%);
+$dark_fill: mix($borders_color, $bg_color, 50%);
 $headerbar_color: if($variant == 'light', lighten($bg_color, 5%), darken($bg_color, 3%));
 $menu_color: if($variant == 'light', $base_color, mix($bg_color, $base_color, 20%));
 $popover_bg_color: $bg_color;
@@ -28,12 +29,12 @@ $scrollbar_slider_active_color: if($variant=='light', darken($selected_bg_color,
 
 $warning_color: #f57900;
 $error_color: #cc0000;
-$success_color: if($variant == 'light', #73d216, darken(#73d216,10%));
-$destructive_color: if($variant == 'light', #ef2929, darken(#ef2929,10%));
+$success_color: if($variant == 'light', #73d216, darken(#73d216, 10%));
+$destructive_color: if($variant == 'light', #ef2929, darken(#ef2929, 10%));
 
 $osd_fg_color: #eeeeec;
 $osd_text_color: white;
-$osd_bg_color: transparentize(#202526, 0.2);
+$osd_bg_color: transparentize(#1c1f20, 0.3);
 $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
 $osd_borders_color: transparentize(black, 0.3);
@@ -58,7 +59,7 @@ $backdrop_bg_color: $bg_color;
 $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 50%);
 $backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%));
 $backdrop_selected_fg_color: if($variant == 'light', $backdrop_base_color, $backdrop_text_color);
-$backdrop_borders_color: mix($borders_color, $bg_color, 90%);
+$backdrop_borders_color: mix($borders_color, $bg_color, 80%);
 $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%);
 $backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, 50%);