Changes suggested by Benjamin Berg's reviewgtk3

Signed-off-by: Manuel Quiñones <manuq@laptop.org>

3 files changed, 5 insertions, 108 deletions

diff --git a/gtk3/theme/gtk-widgets.css.em b/gtk3/theme/gtk-widgets.css.em
index adcd12d..eb971b2 100644
--- a/gtk3/theme/gtk-widgets.css.em
+++ b/gtk3/theme/gtk-widgets.css.em
@@ -41,6 +41,7 @@ else: # About 72% of the XO size, adjusted so that eg. toolbuttons work
 #
 # But a screenshot shows that the graphic was actually rendered at 26px
 # so the SVG displays at the correct size.
+# FIXME this only works for 100, has not been tested in 75 resolution
 radio_size = 26
 scale_slider_width = my_floor(2 * subcell_size + line_width)
 thickness = my_ceil(line_width)
@@ -170,17 +171,10 @@ icon_large = icon_base * 5
 
 /* Spin buttons */
 
-.spinbutton {
-    ${ spin_ythickness = my_ceil(3*subcell_size - font_height) }
-    ${ spin_xthickness = subcell_size }
-    ${ spin_btn_ythickness = spin_ythickness }
-    ${ spin_btn_xthickness = subcell_size * 2 }
-
-    /* small inner border and a lage x/ythickness for entries
-       to reduce the number of hacks needed :-) */
-    # FIXME this is setting the wrong padding
-    /* padding: $(spin_xthickness)px $(spin_ythickness)px; */
-}
+${ spin_ythickness = my_ceil(3*subcell_size - font_height) }
+${ spin_xthickness = subcell_size }
+${ spin_btn_ythickness = spin_ythickness }
+${ spin_btn_xthickness = subcell_size * 2 }
 
 .spinbutton.button,
 .spinbutton.button:focused,
diff --git a/gtk3/theme/gtk.css b/gtk3/theme/gtk.css
index 0c51959..7c95e5f 100644
--- a/gtk3/theme/gtk.css
+++ b/gtk3/theme/gtk.css
@@ -20,102 +20,6 @@
 
 /* Colormap actually used by the theme, to be overridden in other css files */
 @define-color theme_base_color @base_color;
-@define-color theme_text_color @text_color;
-@define-color theme_bg_color @bg_color;
-@define-color theme_fg_color @fg_color;
-@define-color theme_tooltip_bg_color @tooltip_bg_color;
-@define-color theme_tooltip_fg_color @tooltip_fg_color;
-@define-color theme_selected_bg_color @selected_bg_color;
-@define-color theme_selected_fg_color @selected_fg_color;
-
-@define-color menu_bg_color shade (@theme_bg_color, 0.45);
-@define-color menu_fg_color #ffffff;
-@define-color menu_controls_color #aaaaaa;
-
-@define-color link_color #4a90d9;
-@define-color frame_color #8a9580;
-@define-color inactive_frame_color #c7ccc1;
-@define-color warning_color #f57900;
-@define-color error_color #cc0000;
-@define-color success_color #4e9a06;
-
-@define-color info_fg_color rgb (181, 171, 156);
-@define-color info_bg_color rgb (252, 252, 189);
-@define-color warning_fg_color rgb (173, 120, 41);
-@define-color warning_bg_color rgb (250, 173, 61);
-@define-color question_fg_color rgb (97, 122, 214);
-@define-color question_bg_color rgb (138, 173, 212);
-@define-color error_fg_color rgb (166, 38, 38);
-@define-color error_bg_color rgb (237, 54, 54);
-
-@define-color keyboard_focus_border_a #a2c9f1;
-@define-color keyboard_focus_border_b #6794cf;
-
-@define-color os_chrome_bg_color black;
-@define-color os_chrome_fg_color #ccc;
-@define-color os_chrome_selected_bg_color #333;
-@define-color os_chrome_selected_fg_color white;
-
-@define-color chrome_bg_color #1e1a17;
-@define-color chrome_fg_color #fff;
-
-@define-color focused_entry_border #579eea;
-@define-color focused_entry_inset alpha (#d7e4f1, 0.50);
-
-@define-color button_gradient_color_a #f4f6f4;
-@define-color button_gradient_color_b #d7dad7;
-@define-color button_border #a7aba7;
-
-@define-color button_hover_gradient_color_a @theme_base_color;
-@define-color button_hover_gradient_color_b shade (@button_gradient_color_a, 0.94);
-
-@define-color button_active_gradient_color_a #a2a9a2;
-@define-color button_active_gradient_color_b shade (@button_active_gradient_color_a, 0.83);
-
-@define-color insensitive_bg_color #f4f4f2;
-@define-color insensitive_fg_color #a7aba7;
-@define-color insensitive_border_color shade (@internal_element_color, 1.37);
-
-@define-color trough_bg_color_a #ccccc7;
-@define-color trough_bg_color_b #e4e4e1;
-
-@define-color active_switch_bg_color_a #509ae7;
-@define-color active_switch_bg_color_b #84b8ee;
-
-@define-color switch_slider_color #eeeeec;
-@define-color switch_slider_border #2a79cb;
-
-@define-color progressbar_background_a #76b0ec;
-@define-color progressbar_background_b #1f72c6;
-@define-color progressbar_border #3277bf;
-@define-color progressbar_pattern #000000;
-
-@define-color internal_element_color #888a85;
-
-@define-color scale_fill @insensitive_border_color;
-@define-color scale_border_a @internal_element_color;
-@define-color scale_border_b shade (@internal_element_color, 1.25);
-@define-color scale_progress_fill #2c85e2;
-@define-color scale_progress_border_a #1864b2;
-@define-color scale_progress_border_b #3e90e5;
-
-@define-color highlighted_border #8a8f8a;
-
-@define-color notebook_border #a6a6a6;
-@define-color notebook_active_tab_border #1372d3;
-@define-color notebook_selected_tab_color #8dc0f3;
-
-@define-color notebook_tab_gradient_a @theme_base_color;
-@define-color notebook_tab_gradient_b @switch_slider_color;
-
-@define-color toolbar_gradient_base #aaaa9e;
-@define-color toolbar_gradient_step1 #bcbcb4;
-@define-color toolbar_gradient_step2 #d9d9d7;
-@define-color toolbar_gradient_final #e5e5e2;
-
-@define-color toolbar_active_button_color #909081;
-
-@define-color expander_row_selected_color #acccee;
 
 @import url("gtk-widgets.css");
 
diff --git a/gtk3/theme/settings.ini.em b/gtk3/theme/settings.ini.em
index f4d6369..bd2d7cd 100644
--- a/gtk3/theme/settings.ini.em
+++ b/gtk3/theme/settings.ini.em
@@ -12,7 +12,6 @@ icon_large = icon_base * 5
 }
 
 [Settings]
-#gtk-color-scheme = "base_color:#ffffff\nbg_color:#ededed\ntooltip_bg_color:#343434\nselected_bg_color:#4a90d9\ntext_color:#2e3436\nfg_color:#2e3436;\ntooltip_fg_color:#ffffff\nselected_fg_color:#ffffff"
 gtk-auto-mnemonics = 1
 gtk-toolbar-style = GTK_TOOLBAR_ICONS