[gnome-themes-standard] all: reorder color defines to match between dark and light themes

[Cosimo Cecchi <cosimoc src gnome org>]

commit b8b0430b0e0f7481a5532cd4ddb7fe2967dd380b
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Mon Apr 30 13:34:34 2012 -0400

    all: reorder color defines to match between dark and light themes
    
    And remove redundant/unused color defines from both.

 themes/Adwaita/gtk-3.0/gtk-main-dark.css |   96 +++++++++++-------------------
 themes/Adwaita/gtk-3.0/gtk-main.css      |   59 ++++---------------
 2 files changed, 46 insertions(+), 109 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index 7bf7576..022c288 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -1,10 +1,9 @@
-/* dark colormap */
-
+/* Dark color scheme */
 @define-color theme_base_color #333333;
- define-color theme_text_color #eeeeec;
 @define-color theme_bg_color #393f3f;
- define-color theme_fg_color @theme_text_color;
 @define-color theme_selected_bg_color #3465a4;
+ define-color theme_text_color #eeeeec;
+ define-color theme_fg_color @theme_text_color;
 @define-color theme_selected_fg_color @theme_text_color;
 
 @define-color placeholder_text_color shade(@theme_text_color, 0.4);
@@ -30,59 +29,50 @@
 @define-color menu_combobox_border darker (@theme_selected_bg_color);
 @define-color menu_separator mix (@menu_fg_color, @menu_bg_color, 0.95);
 
+ define-color inactive_frame_color shade (@theme_bg_color, 0.8);
+
+ define-color sidebar_bg shade (@theme_bg_color, 1.02);
+ define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
+
 @define-color button_gradient_color_a shade (@theme_bg_color, 1.15);
 @define-color button_gradient_color_b @theme_bg_color;
 @define-color button_gradient_color_c shade (@theme_bg_color, 0.8);
 @define-color borders #24282a;
 
+ define-color button_active_gradient_color_a shade (@button_gradient_color_b, 0.7);
+ define-color button_active_gradient_color_b shade (@button_gradient_color_a, 0.7);
 @define-color button_active_text @theme_selected_bg_color;
 @define-color button_active_text_shadow alpha(black, 0.6);
 @define-color button_text_shadow alpha(black, 0.7);
- define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
-
- define-color button_active_gradient_color_a shade (@button_gradient_color_b, 0.7);
- define-color button_active_gradient_color_b shade (@button_gradient_color_a, 0.7);
 
 @define-color button_hover_gradient_color_a shade (@button_gradient_color_a, 1.10);
 @define-color button_hover_gradient_color_b shade (@button_gradient_color_b, 1.02);
 
- define-color button_raised_gradient_color_a @button_gradient_color_a;
- define-color button_raised_gradient_color_b @button_gradient_color_b;
- define-color button_raised_linked_shadow alpha(#000000, 0.14);
-
- define-color button_raised_active_gradient_color_a @button_raised_gradient_color_b;
- define-color button_raised_active_gradient_color_b @button_raised_gradient_color_a;
-
 @define-color insensitive_fg_color #535555;
 @define-color insensitive_bg_color mix(@theme_bg_color, @theme_base_color, 0.6);
 @define-color insensitive_borders #535555;
 
- define-color inactive_frame_color shade (@theme_bg_color, 0.8);
-
- define-color notebook_active_tab_border shade (@theme_selected_bg_color, 0.5);
- define-color notebook_selected_tab_color alpha (@theme_selected_bg_color, 0.75);
+ define-color trough_bg_color_a #30312f;
+ define-color trough_bg_color_b #41433f;
 
- define-color notebook_tab_gradient_a shade(@theme_bg_color, 0.8);
- define-color notebook_tab_gradient_b shade(@theme_bg_color, 0.75);
- define-color notebook_tab_hilight shade(@theme_bg_color, 0.9);
+ define-color scrollbar_trough shade(@theme_bg_color, 1.2);
+ define-color scrollbar_trough_insensitive shade(@theme_bg_color, 1.05); /* FIXME */
+ define-color scrollbar_trough_unfocused shade(@theme_unfocused_bg_color, 1.2);
+ define-color scrollbar_slider mix(@scrollbar_trough, @theme_fg_color, 0.15);
+ define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.3);
+ define-color scrollbar_slider_active @theme_selected_bg_color;
+ define-color scrollbar_slider_insensitive alpha(black, 0); /* FIXME should be transparent */
+ define-color scrollbar_slider_unfocused shade(@theme_unfocused_base_color, 0.8);
 
 @define-color switch_slider_color shade(@theme_bg_color, 0.9);
- define-color switch_slider_active_border shade(@switch_trough_active_bg_a, 0.60);
- define-color switch_slider_insensitive_bg @theme_bg_color;
-
 @define-color switch_trough_active_color @theme_text_color;
 @define-color switch_trough_active_bg_a shade(@theme_selected_bg_color, 0.6);
 @define-color switch_trough_active_bg_b @theme_selected_bg_color;
 
- define-color highlighted_border @borders;
- define-color internal_element_color #595959;
- define-color internal_element_prelight #eeeeee;
- define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.65);
-
 @define-color progressbar_background_a shade(@theme_selected_bg_color, 1.15);
 @define-color progressbar_background_b shade(@theme_selected_bg_color, 0.8);
 @define-color progressbar_pattern @progressbar_background_b;
- define-color progressbar_border @switch_slider_active_border;
+ define-color progressbar_border shade(@switch_trough_active_bg_a, 0.60);
 @define-color progressbar_unfocused_background @unfocused_borders;
 @define-color progressbar_unfocused_border @theme_unfocused_fg_color;
 
@@ -92,54 +82,38 @@
 
 @define-color entry_inset alpha(black, 0.15);
 
+ define-color internal_element_color #595959;
+ define-color internal_element_prelight #eeeeee;
+ define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.65);
 
- define-color frame_color #707070;
+ define-color scale_progress_fill #2c85e2;
 
- define-color focused_entry_border @theme_selected_bg_color;
- define-color focused_entry_inset alpha (@theme_selected_bg_color, 0.50);
+ define-color notebook_active_tab_border shade(@theme_selected_bg_color, 0.5);
+ define-color notebook_selected_tab_color alpha(@theme_selected_bg_color, 0.75);
+
+ define-color notebook_tab_gradient_a shade(@theme_bg_color, 0.8);
+ define-color notebook_tab_gradient_b shade(@theme_bg_color, 0.75);
+ define-color notebook_tab_hilight shade(@theme_bg_color, 0.9);
 
 @define-color toolbar_gradient_a shade(@theme_bg_color, 0.75);
 @define-color toolbar_gradient_b shade(@theme_bg_color, 0.8);
 @define-color toolbar_gradient_c shade(@theme_bg_color, 0.9);
 
- define-color toolbar_active_button_color #222222;
 @define-color toolbar_border_top shade(@borders, 0.7);
 @define-color toolbar_border_bottom shade(@borders, 1.05);
 
+ define-color toolbar_active_button_color #222222;
 @define-color toolbar_button_prelight alpha(black, 0.3);
 
- define-color primary_toolbar_entry_bg #ffffff;
- define-color primary_toolbar_entry_fg #2e3436;
+ define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
+
+ define-color treeview_focus_border shade (@theme_selected_bg_color, 1.20);
 
 @define-color expander_row_selected_color alpha (@theme_base_color, 0.60);
 
 @define-color inset_light_color alpha(white, 0.05);
 @define-color inset_dark_color alpha(black, 0.25);
 
- define-color keyboard_focus_border_a alpha (@theme_fg_color, 0.30);
- define-color keyboard_focus_border_b alpha (@theme_fg_color, 0.10);
-
- define-color sidebar_bg shade (@theme_bg_color, 1.02);
-
- define-color trough_bg_color_a #30312f;
- define-color trough_bg_color_b #41433f;
-
- define-color scrollbar_trough shade(@theme_bg_color, 1.2);
- define-color scrollbar_trough_insensitive shade(@theme_bg_color, 1.05); /* FIXME */
- define-color scrollbar_trough shade(@theme_unfocused_bg_color, 1.2);
- define-color scrollbar_slider mix(@scrollbar_trough, @theme_fg_color, 0.15);
- define-color scrollbar_slider_prelight mix(@scrollbar_trough, @theme_fg_color, 0.3);
- define-color scrollbar_slider_active @theme_selected_bg_color;
- define-color scrollbar_slider_insensitive alpha(black, 0); /* FIXME should be transparent */
- define-color scrollbar_slider_unfocused shade(@theme_unfocused_base_color, 0.8);
-
- define-color treeview_focus_border shade (@theme_selected_bg_color, 1.20);
-
- define-color scale_fill shade (@insensitive_borders, 0.90);
- define-color scale_progress_fill #2c85e2;
- define-color scale_border_a shade (@internal_element_color, 0.90);
- define-color scale_border_b shade (@internal_element_color, 0.65);
-
 /******
  * WM *
  ******/
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index d0706cf..0cd9d5a 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -1,19 +1,10 @@
 /* Default color scheme */
- define-color base_color #ffffff;
- define-color bg_color #ededed;
- define-color selected_bg_color #4a90d9;
- define-color text_color #2e3436;
- define-color fg_color #2e3436;
- define-color selected_fg_color #ffffff;
- define-color unfocused_bg_color @bg_color;
-
-/* 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_selected_bg_color @selected_bg_color;
- define-color theme_selected_fg_color @selected_fg_color;
+ define-color theme_base_color #ffffff;
+ define-color theme_bg_color #ededed;
+ define-color theme_selected_bg_color #4a90d9;
+ define-color theme_text_color #2e3436;
+ define-color theme_fg_color @theme_text_color;
+ define-color theme_selected_fg_color #ffffff;
 
 @define-color placeholder_text_color shade(@text_color, 3.5);
 
@@ -38,18 +29,11 @@
 @define-color menu_combobox_border #3277bf;
 @define-color menu_separator mix (@menu_fg_color, @menu_bg_color, 0.9);
 
- define-color frame_color #8a9580;
 @define-color inactive_frame_color #c7ccc1;
 
- define-color keyboard_focus_border_a #a2c9f1;
- define-color keyboard_focus_border_b #6794cf;
-
 @define-color sidebar_bg shade (@theme_bg_color, 1.025);
 @define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
 
- define-color focused_entry_border #579eea;
- define-color focused_entry_inset alpha (#d7e4f1, 0.50);
-
 @define-color button_gradient_color_a shade(@theme_bg_color, 1.05);
 @define-color button_gradient_color_b @theme_bg_color;
 @define-color button_gradient_color_c shade(@theme_bg_color, 0.92);
@@ -60,20 +44,10 @@
 @define-color button_active_text @theme_base_color;
 @define-color button_active_text_shadow alpha(black, 0.4);
 @define-color button_text_shadow alpha(white, 0.4);
- define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
 
 @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 unfocused_button_hover_background @unfocused_theme_base_color;
-
- define-color button_raised_gradient_color_a @button_gradient_color_a;
- define-color button_raised_gradient_color_b @button_gradient_color_b;
- define-color button_raised_linked_shadow alpha(@theme_base_color, 0.70);
-
- define-color button_raised_active_gradient_color_a @button_active_gradient_color_a;
- define-color button_raised_active_gradient_color_b alpha(@button_active_gradient_color_b, 0.13);
-
 @define-color insensitive_bg_color #f4f4f2;
 @define-color insensitive_fg_color #a7aba7;
 @define-color insensitive_borders shade (@internal_element_color, 1.37);
@@ -91,22 +65,18 @@
 @define-color scrollbar_slider_unfocused @theme_unfocused_bg_color;
 
 @define-color switch_slider_color #eeeeec;
- define-color switch_slider_active_border #2a79cb;
- define-color switch_slider_insensitive_bg @insensitive_bg_color;
-
 @define-color switch_trough_active_color @theme_base_color;
 @define-color switch_trough_active_bg_a #509ae7;
 @define-color switch_trough_active_bg_b #a5d0ff;
 
 @define-color progressbar_background_a #76b0ec;
 @define-color progressbar_background_b #1f72c6;
- define-color progressbar_pattern @switch_slider_active_border;
- define-color progressbar_border @switch_slider_active_border;
+ define-color progressbar_pattern #2a79cb;
+ define-color progressbar_border @progressbar_pattern;
 @define-color progressbar_unfocused_background @theme_base_color;
 @define-color progressbar_unfocused_border @unfocused_borders;
 
 @define-color entry_text_color @theme_text_color;
-
 @define-color entry_background_a shade(@theme_base_color, 0.94);
 @define-color entry_background_b @theme_base_color;
 
@@ -116,13 +86,8 @@
 @define-color internal_element_prelight @theme_text_color;
 @define-color internal_element_insensitive mix(@internal_element_color, @theme_base_color, 0.7);
 
- define-color scale_fill @insensitive_borders;
- 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 highlighted_border #8a8f8a;
-
 @define-color notebook_active_tab_border #1372d3;
 @define-color notebook_selected_tab_color #8dc0f3;
 
@@ -137,14 +102,12 @@
 @define-color toolbar_border_top shade(@borders, 0.9);
 @define-color toolbar_border_bottom shade(@borders, 1.1);
 
- define-color toolbar_button_prelight alpha(white, 0.4);
-
 @define-color toolbar_active_button_color #909081;
+ define-color toolbar_button_prelight alpha(white, 0.4);
 
- define-color primary_toolbar_entry_bg @theme_base_color;
- define-color primary_toolbar_entry_fg @theme_text_color;
+ define-color primary_toolbar_button_text_shadow alpha(black, 0.1);
 
- define-color treeview_focus_border @switch_slider_active_border;
+ define-color treeview_focus_border #2a79cb;
 
 @define-color expander_row_selected_color #acccee;