[gnome-themes-standard] Dark theme: finished color tweaking.

[Lapo Calamandrei <lapo src gnome org>]

commit f03d58adc02f3e5620d89d72d6d2fdaea667ef18
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Thu Dec 1 22:13:33 2011 +0100

    Dark theme: finished color tweaking.

 .../gtk-3.0/borders/column-header-border-dark.svg  |   10 ++++----
 .../borders/column-header-border-last-dark.svg     |    8 +++---
 themes/Adwaita/gtk-3.0/gtk-dark.css                |    8 ++++--
 .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css |   26 ++++++++++++-------
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |    4 +-
 themes/Adwaita/gtk-3.0/gtk.css                     |    2 +
 6 files changed, 34 insertions(+), 24 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/borders/column-header-border-dark.svg b/themes/Adwaita/gtk-3.0/borders/column-header-border-dark.svg
index b52224f..014acc8 100644
--- a/themes/Adwaita/gtk-3.0/borders/column-header-border-dark.svg
+++ b/themes/Adwaita/gtk-3.0/borders/column-header-border-dark.svg
@@ -35,7 +35,7 @@
        xlink:href="#linearGradient3789"
        id="linearGradient3795"
        x1="8.000001"
-       y1="1"
+       y1="6.2183008"
        x2="8.000001"
        y2="16"
        gradientUnits="userSpaceOnUse"
@@ -48,9 +48,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="11.949257"
-     inkscape:cy="10.921355"
+     inkscape:zoom="1"
+     inkscape:cx="14.354102"
+     inkscape:cy="11.599584"
      inkscape:current-layer="layer1"
      showgrid="false"
      inkscape:grid-bbox="true"
@@ -101,7 +101,7 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="color:#000000;fill:#4f524f;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:1"
+       style="color:#000000;fill:#2b2f2f;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-opacity:1"
        d="m 0,0 0,16 16,0 0,-16 z m 4,3 7,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 L 4,13 C 3.446,13 3,12.554 3,12 L 3,4 C 3,3.446 3.446,3 4,3 z"
        id="rect2997"
        inkscape:connector-curvature="0"
diff --git a/themes/Adwaita/gtk-3.0/borders/column-header-border-last-dark.svg b/themes/Adwaita/gtk-3.0/borders/column-header-border-last-dark.svg
index 7966944..b288245 100644
--- a/themes/Adwaita/gtk-3.0/borders/column-header-border-last-dark.svg
+++ b/themes/Adwaita/gtk-3.0/borders/column-header-border-last-dark.svg
@@ -15,7 +15,7 @@
    id="svg33222"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="column-header-border-dark.svg">
+   sodipodi:docname="column-header-border-last-dark.svg">
   <defs
      id="defs33224">
     <linearGradient
@@ -49,7 +49,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="16"
-     inkscape:cx="13.736691"
+     inkscape:cx="13.861691"
      inkscape:cy="11.026672"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -92,7 +92,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -101,7 +101,7 @@
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
     <path
-       style="color:#000000;fill:#4f524f;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="color:#000000;fill:#2b2f2f;fill-opacity:1;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        d="m 0,0 0,16 16,0 0,-16 z m 4,3 8,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 L 4,13 C 3.446,13 3,12.554 3,12 L 3,4 C 3,3.446 3.446,3 4,3 z"
        id="rect2997"
        inkscape:connector-curvature="0"
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index 00f22dd..e7f5053 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -7,7 +7,7 @@
 @define-color theme_selected_bg_color #3465a4;
 @define-color theme_selected_fg_color @theme_text_color;
 
- define-color placeholder_text_color shade(@theme_text_color, 0.7);
+ define-color placeholder_text_color shade(@theme_text_color, 0.3);
 
 @define-color menu_bg_color #555753;
 @define-color menu_fg_color @theme_text_color;
@@ -52,7 +52,7 @@
 @define-color notebook_tab_gradient_a @button_gradient_color_a;
 @define-color notebook_tab_gradient_b @button_gradient_color_b;
 
- define-color switch_slider_color shade(@theme_bg_color, 0.95);
+ 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;
 
@@ -63,7 +63,7 @@
 @define-color highlighted_border @button_border;
 @define-color internal_element_color #555555;
 @define-color internal_element_prelight #eeeeee;
- define-color internal_element_insensitive shade (@internal_element_color, 0.75);
+ define-color internal_element_insensitive shade (@internal_element_color, 0.63);
 
 @define-color progressbar_background_a shade(@theme_selected_bg_color, 1.15);
 @define-color progressbar_background_b shade(@theme_selected_bg_color, 0.8);
@@ -106,6 +106,8 @@
 @define-color trough_bg_color_a #30312f;
 @define-color trough_bg_color_b #41433f;
 
+ define-color scrollbar_trough_color #414141;
+
 @define-color treeview_focus_border shade (@theme_selected_bg_color, 1.20);
 
 @define-color scale_fill shade (@insensitive_border_color, 0.90);
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
index f84f321..dc73de2 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
@@ -31,11 +31,6 @@ GtkIconView.view.cell:selected:focus {
     -adwaita-focus-border-dashes: true;
 }
 
-GtkSwitch.slider {
-    border-color: mix (@button_border, black, 0.4);
-    box-shadow: 0 -1 inset alpha(white, 0.07), 0 1 inset @theme_base_color, 0 2 inset alpha(@button_border, 0.15);
-}
-
 .button,
 GtkComboBox {
     text-shadow: @button_text_shadow 0 -1;
@@ -78,11 +73,22 @@ column-header .button {
     color: alpha (@theme_text_color, 0.1);
 }
 
-.spinbutton .button:insensitive {
-    /* color: shade(@internal_element_color, 1.65); */
-    color: shade(@internal_element_color, 1.27);
+.scrollbar.slider:prelight,
+.scrollbar.button:prelight,
+.scrollbar.button:prelight:active {
+    border-color: shade (@highlighted_border, 0.75);
+}
+
+GtkSwitch.slider {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (@theme_bg_color),
+                                     to (@switch_slider_color));
+
+    -adwaita-switch-grip-color: shade (@switch_slider_color, 0.9);
 }
 
-.scrollbar.button {
-    color: shade(@internal_element_color, 0.4);
+GtkSwitch.slider {
+    border-color: mix (@button_border, black, 0.4);
+    box-shadow: 0 -1 inset alpha(white, 0.04), 0 1 inset shade(@theme_bg_color, 1.1), 0 2 inset alpha(@button_border, 0.2);
 }
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 0aa19f0..345d87e 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -915,7 +915,7 @@ GtkComboBox .button *:prelight {
 
 .scrollbar.trough {
     background-image: none;
-    background-color: shade (@theme_bg_color, 0.882);
+    background-color: @scrollbar_trough_color;
     border-width: 0;
     border-radius: 0;
     border-image: none;
@@ -1360,7 +1360,7 @@ GtkSwitch.slider {
                                      from (@theme_base_color),
                                      to (@switch_slider_color));
 
-    -adwaita-switch-grip-color: shade (@switch_slider_color, 0.97);
+    -adwaita-switch-grip-color: shade (@switch_slider_color, 0.95);
 }
 
 GtkSwitch.slider:active {
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index c4ad4d9..5685f74 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -87,6 +87,8 @@
 @define-color trough_bg_color_a #bcbcb7;
 @define-color trough_bg_color_b #e0e0dd;
 
+ define-color scrollbar_trough_color shade(@theme_bg_color, 0.882);
+
 @define-color switch_slider_color #eeeeec;
 @define-color switch_slider_active_border #2a79cb;
 @define-color switch_slider_insensitive_bg @insensitive_bg_color;