[gnome-themes-standard] Widget theme: column headers love.



commit 914c76a86a935d242899c5e19935371dca4d93e7
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Mon Dec 5 17:35:54 2011 +0100

    Widget theme: column headers love.

 .../gtk-3.0/borders/column-header-border-dark.svg  |  116 --------------
 .../borders/column-header-border-last-dark.svg     |  110 -------------
 .../gtk-3.0/borders/column-header-border-last.svg  |  163 -------------------
 .../gtk-3.0/borders/column-header-border.svg       |  169 --------------------
 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |   10 +-
 .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css   |   13 ++-
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |   13 ++-
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   62 +++----
 themes/Adwaita/gtk-3.0/gtk.css                     |    2 +-
 9 files changed, 59 insertions(+), 599 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index 6d3d3d2..18ba24c 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -107,7 +107,15 @@ GtkComboBox.combobox-entry .button:focus,
 GtkComboBox.combobox-entry .button:active,
 GtkComboBox.combobox-entry .button:hover:active,
 .spinbutton .button:active,
-.spinbutton .button:active:hover {
+.spinbutton .button:active:hover,
+column-header.button:active,
+column-header .button:active,
+column-header.button:active:hover,
+column-header .button:active:hover,
+column-header.button:active:hover:focus,
+column-header .button:active:hover:focus,
+column-header.button:active:focus,
+column-header .button:active:focus {
     background-image: -gtk-gradient(linear,
                                     left top, left bottom,
                                     from(shade(@entry_background_a, 0.9)),
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
index 9e15e9e..4c2d4c0 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
@@ -122,6 +122,7 @@ column-header.button:hover,
 column-header .button:hover,
 column-header.button:focus,
 column-header .button:focus,
+column-header .button:insensitive,
 column-header.button:focus:hover,
 column-header .button:focus:hover,
 column-header.button:active:focus:hover,
@@ -130,7 +131,12 @@ column-header.button:active:focus,
 column-header .button:active:focus,
 column-header.button:active:hover,
 column-header .button:active:hover {
-    border-image: url("borders/column-header-border-dark.svg") 4 5 4 4 / 4 5 4 4 stretch;
+    border-image: -gtk-gradient (linear,
+                                 left top, left bottom,
+                                 from (@button_border),
+                                 to (@theme_base_color)) 0 1 0 0;
+    border-width: 0 1 0 0;
+    border-radius: 0;
 }
 
 column-header.button:last-child,
@@ -139,6 +145,8 @@ column-header.button:hover:last-child,
 column-header:last-child .button:hover,
 column-header.button:focus:last-child,
 column-header:last-child .button:focus,
+column-header .button:insensitive:last-child,
+column-header:last-child .button:insensitive,
 column-header.button:focus:hover:last-child,
 column-header:last-child .button:focus:hover,
 column-header.button:active:focus:hover:last-child,
@@ -147,5 +155,6 @@ column-header.button:active:focus:last-child,
 column-header:last-child .button:active:focus,
 column-header.button:active:hover:last-child,
 column-header:last-child .button:active:hover {
-    border-image: url("borders/column-header-border-last-dark.svg") 4 / 4 stretch;
+    border-image: none;
+    border-width: 0;
 }
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index 0c970cc..901a829 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -122,6 +122,7 @@ column-header.button:hover,
 column-header .button:hover,
 column-header.button:focus,
 column-header .button:focus,
+column-header .button:insensitive,
 column-header.button:focus:hover,
 column-header .button:focus:hover,
 column-header.button:active:focus:hover,
@@ -130,7 +131,12 @@ column-header.button:active:focus,
 column-header .button:active:focus,
 column-header.button:active:hover,
 column-header .button:active:hover {
-    border-image: url("borders/column-header-border.svg") 4 5 4 4 / 4 5 4 4 stretch;
+    border-image: -gtk-gradient (linear,
+                                 left top, left bottom,
+                                 from (@button_border),
+                                 to (@theme_base_color)) 0 1 0 0;
+    border-width: 0 1 0 0;
+    border-radius: 0;
 }
 
 column-header.button:last-child,
@@ -139,6 +145,8 @@ column-header.button:hover:last-child,
 column-header:last-child .button:hover,
 column-header.button:focus:last-child,
 column-header:last-child .button:focus,
+column-header .button:insensitive:last-child,
+column-header:last-child .button:insensitive,
 column-header.button:focus:hover:last-child,
 column-header:last-child .button:focus:hover,
 column-header.button:active:focus:hover:last-child,
@@ -147,5 +155,6 @@ column-header.button:active:focus:last-child,
 column-header:last-child .button:active:focus,
 column-header.button:active:hover:last-child,
 column-header:last-child .button:active:hover {
-    border-image: url("borders/column-header-border-last.svg") 4 / 4 stretch;
+    border-image: none;
+    border-width: 0;
 }
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 1dc400d..b862878 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -1415,55 +1415,47 @@ GtkTreeView {
 
 column-header.button,
 column-header .button {
+    color: @internal_element_color;
+}
+
+column-header.button,
+column-header .button,
+column-header.button:insensitive,
+column-header:insensitive. .button,
+column-header .button:insensitive,
+column-header.button:hover,
+column-header .button:hover,
+column-header.button:focus:hover,
+column-header .button:focus:hover {
     background-color: @theme_base_color;
     background-image: none;
     padding: 0 4;
+    text-shadow: none;
+    icon-shadow: none;
+    font-weight: bold; /* Not sure about this one */
 }
 
-column-header.button:active:focus:hover,
-column-header .button:active:focus:hover,
-column-header.button:active:focus,
-column-header .button:active:focus,
-column-header.button:active:hover,
-column-header .button:active:hover {
-    font: bold; /* doesn't work */
+column-header.button:insensitive,
+column-header:insensitive. .button,
+column-header .button:insensitive {
+    color: @internal_element_color_insensitive;
 }
 
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:active:focus:hover,
-column-header .button:active:focus:hover {
-    color: white; /*doesn't work */
-    background-color: @theme_bg_color;
-    text-shadow: white 0 1;
-}
-
-/* this kinda is a gross hack, I'll do something better with border images */
 column-header.button:hover,
 column-header .button:hover,
 column-header.button:focus:hover,
 column-header .button:focus:hover,
+column-header.button:active:focus:hover,
+column-header .button:active:focus:hover,
 column-header.button:active:focus,
-column-header .button:active:focus {
-    background-color: @theme_base_color;
-    background-image: none;
-    border-width: 4 5 4 4;
-}
-
-column-header.button:hover:last-child,
-column-header:last-child .button:hover,
-column-header.button:focus:hover:last-child,
-column-header:last-child .button:focus:hover,
-column-header.button:active:focus:last-child,
-column-header:last-child .button:active:focus {
-    background-color: @theme_base_color;
-    background-image: none;
-    border-width: 4 5 4 4;
+column-header .button:active:focus,
+column-header.button:active:hover,
+column-header .button:active:hover {
+    color: @internal_element_color_prelight;
+    text-shadow: none;
+    icon-shadow: none;
 }
 
-column-header .button GtkArrow {
-    color: @internal_element_color;
-}
 
 row:hover {
     border-width: 0;
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index 5685f74..e9922e9 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -111,7 +111,7 @@
 
 @define-color internal_element_color #888a85;
 @define-color internal_element_prelight @theme_text_color;
- define-color internal_element_insensitive shade (@internal_element_color, 1.6);
+ define-color internal_element_insensitive shade (@internal_element_color, 1.7);
 
 @define-color scale_fill @insensitive_border_color;
 @define-color scale_border_a @internal_element_color;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]