GNOME.org
 

[gnome-themes-standard] Widget theme: assets cleanup and some GtkScale refresh.

commit ee1c0c98231072694e935ac2ed6c026c5612a7ba
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Tue Nov 22 16:00:25 2011 +0100

    Widget theme: assets cleanup and some GtkScale refresh.

 themes/Adwaita/gtk-3.0/assets/Makefile.am          |   20 +--
 .../gtk-3.0/assets/button-active-border-dark.svg   |  130 ------------
 .../Adwaita/gtk-3.0/assets/button-border-dark.svg  |  175 ----------------
 .../gtk-3.0/assets/button-default-border-dark.svg  |  122 -----------
 .../gtk-3.0/assets/button-default-border.svg       |  148 -------------
 .../gtk-3.0/assets/entry-border-focused-dark.svg   |   74 -------
 .../gtk-3.0/assets/entry-border-normal-dark.svg    |  102 ---------
 .../primary-toolbar-button-active-border-dark.svg  |  119 -----------
 .../primary-toolbar-raised-button-border-dark.svg  |  131 ------------
 .../gtk-3.0/assets/progressbar-border-dark.svg     |   97 ---------
 .../assets/progressbar-border-vertical-dark.svg    |   97 ---------
 .../trough-active-border-horizontal-dark.svg       |  141 -------------
 .../assets/trough-active-border-horizontal.svg     |  142 -------------
 .../assets/trough-active-border-vertical-dark.svg  |  141 -------------
 .../assets/trough-active-border-vertical.svg       |  131 ------------
 .../assets/trough-border-horizontal-dark.svg       |  219 --------------------
 .../gtk-3.0/assets/trough-border-horizontal.svg    |  187 -----------------
 .../gtk-3.0/assets/trough-border-vertical-dark.svg |  176 ----------------
 .../gtk-3.0/assets/trough-border-vertical.svg      |  187 -----------------
 themes/Adwaita/gtk-3.0/gtk-dark.css                |    6 +-
 themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css |   36 ----
 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |   21 ++-
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |    8 +-
 .../Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css |   14 ++-
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   39 ++--
 25 files changed, 54 insertions(+), 2609 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/assets/Makefile.am b/themes/Adwaita/gtk-3.0/assets/Makefile.am
index e1ea3ce..07615a0 100644
--- a/themes/Adwaita/gtk-3.0/assets/Makefile.am
+++ b/themes/Adwaita/gtk-3.0/assets/Makefile.am
@@ -1,9 +1,5 @@
 assetsdir = $(datadir)/themes/Adwaita/gtk-3.0/assets
 assets_DATA = 		\
-	button-active-border-dark.svg \
-	button-border-dark.svg \
-	button-default-border.svg \
-	button-default-border-dark.svg \
 	checkbox-checked.svg \
 	checkbox-checked-dark.svg \
 	checkbox-checked-insensitive.svg \
@@ -24,12 +20,6 @@ assets_DATA = 		\
 	checkbox-menuitem-checked-selected.svg \
 	checkbox-menuitem-mixed.svg \
 	checkbox-menuitem-mixed-insensitive.svg \
-	entry-border-focused-dark.svg \
-	entry-border-normal-dark.svg \
-	primary-toolbar-button-active-border-dark.svg \
-	primary-toolbar-raised-button-border-dark.svg \
-	progressbar-border-dark.svg \
-	progressbar-border-vertical-dark.svg \
 	radio-selected.svg \
 	radio-selected-dark.svg \
 	radio-selected-insensitive.svg \
@@ -79,14 +69,6 @@ assets_DATA = 		\
 	sidebar-radio-prelight.svg \
 	sidebar-radio-selected.svg \
 	sidebar-radio-selected-dark.svg \
-	sidebar-radio-selected-prelight.svg \
-	trough-border-horizontal.svg \
-	trough-border-horizontal-dark.svg \
-	trough-border-vertical.svg \
-	trough-border-vertical-dark.svg \
-	trough-active-border-horizontal.svg \
-	trough-active-border-horizontal-dark.svg \
-	trough-active-border-vertical.svg \
-	trough-active-border-vertical-dark.svg
+	sidebar-radio-selected-prelight.svg
 
 EXTRA_DIST = $(assets_DATA)
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index e54bd38..0b021a1 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -16,8 +16,8 @@
 @define-color theme_tooltip_bg_color #000000;
 @define-color theme_tooltip_fg_color #eeeeee;
 
- define-color button_gradient_color_a shade (@theme_bg_color, 1.1);
- define-color button_gradient_color_b shade (@theme_bg_color, 0.9);
+ define-color button_gradient_color_a shade (@theme_bg_color, 1.15);
+ define-color button_gradient_color_b shade (@theme_bg_color, 0.8);
 @define-color button_border #24282a;
 
 @define-color button_active_gradient_color_a shade (@button_gradient_color_b, 0.7);
@@ -33,8 +33,8 @@
 @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_bg_color shade(@insensitive_fg_color, 0.6);
 @define-color insensitive_fg_color #535555;
+ define-color insensitive_bg_color shade(@insensitive_fg_color, 0.6);
 @define-color insensitive_border_color #535555;
 
 @define-color inactive_frame_color shade (@theme_bg_color, 0.8);
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
index 6f71723..ba65d3d 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
@@ -96,42 +96,6 @@
     background-image: url("assets/sidebar-radio-selected-prelight.svg");    
 }
 
-/*.entry {
-    border-image: url("assets/entry-border-normal-dark.svg") 2 / 2 stretch;
-}
-
-.entry:focused {
-    border-image: url("assets/entry-border-focused-dark.svg") 2 / 2 stretch;
-}
-
-.primary-toolbar GtkComboBox.combobox-entry .button:active,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover:active,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:hover:active,
-GtkComboBox.combobox-entry .button {
-    border-image: url("assets/entry-border-normal-dark.svg") 2 / 2 2 2 0 stretch;
-}
-*/
-
-GtkScale.trough,
-GtkScale.trough.horizontal {
-    border-image: url("assets/trough-border-horizontal-dark.svg") 2 / 2 stretch;
-}
-
-GtkScale.trough.vertical {
-    border-image: url("assets/trough-border-vertical-dark.svg") 2 / 2 stretch;
-}
-
-GtkSwitch.trough:active,
-GtkScale.progressbar.horizontal {
-    border-image: url("assets/trough-active-border-horizontal-dark.svg") 2 / 2 stretch;
-}
-
-GtkScale.progressbar.vertical {
-    border-image: url("assets/trough-active-border-vertical-dark.svg") 2 / 2 stretch;
-}
-
 GtkScale.slider,
 GtkScale.slider.horizontal {
     background-image: url("assets/scale-slider-horizontal-dark.svg");
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index 0d1d4c9..e64691d 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -20,20 +20,19 @@
 .primary-toolbar .button:active:focus,
 .trough,
 .trough row,
-.trough row:hover,
-GtkSwitch.trough {
+.trough row:hover {
     background-image: -gtk-gradient (linear,
     				     left top, left bottom,
-                                     from (@button_active_gradient_color_a),
-				     to (alpha (@button_active_gradient_color_b, 0.13)));
+                                     from (@button_border),
+				     to (shade(@theme_bg_color, 0.94)));
 }
 
 /* Flipped pushed button background for vertical progressbar through and the like */
 .trough.vertical {
     background-image: -gtk-gradient (linear,
     				     left top, right top,
-                                     from (@button_active_gradient_color_a),
-				     to (alpha (@button_active_gradient_color_b, 0.13)));
+                                     from (@button_border),
+				     to (shade(@theme_bg_color, 0.94)));
 }
 
 /* Prelit button background */
@@ -128,9 +127,17 @@ GtkComboBox.combobox-entry .button:insensitive {
 }
 
 /* Active switch background*/
-GtkSwitch.trough:active {
+GtkSwitch.trough:active,
+GtkScale.progressbar {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (@switch_trough_active_bg_a),
                                      to (@switch_trough_active_bg_b));
 }
+
+GtkScale.progressbar.vertical {
+    background-image: -gtk-gradient (linear,
+                                     left top, right top,
+                                     from (@switch_trough_active_bg_a),
+                                     to (@switch_trough_active_bg_b));
+}
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index 35f7f1c..f011ead 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -59,7 +59,9 @@ GtkSwitch.trough:active {
 .inline-toolbar.toolbar .button:active,
 .inline-toolbar.toolbar .button:active:hover,
 .inline-toolbar.toolbar .button:insensitive,
-.inline-toolbar.toolbar GtkToolButton .button:active {
+.inline-toolbar.toolbar GtkToolButton .button:active,
+.primary-toolbar GtkSwitch.trough,
+.primary-toolbar GtkSwitch.trough:insensitive {
     border-image: url("borders/primary-toolbar-generic-border.svg") 4 / 4 stretch;
     border-radius: 3;
     border-width: 2;
@@ -106,8 +108,8 @@ GtkSwitch.trough:active {
     border-width: 2;
 }
 
+/*
 GtkScale.trough,
-/*GtkSwitch.trough,*/
 GtkScale.trough.horizontal {
     border-image: url("assets/trough-border-horizontal.svg") 2 / 2 stretch;
 }
@@ -116,7 +118,6 @@ GtkScale.trough.vertical {
     border-image: url("assets/trough-border-vertical.svg") 2 / 2 stretch;
 }
 
-/*GtkSwitch.trough:active,*/
 GtkScale.progressbar.horizontal {
     border-image: url("assets/trough-active-border-horizontal.svg") 2 / 2 stretch;
 }
@@ -124,6 +125,7 @@ GtkScale.progressbar.horizontal {
 GtkScale.progressbar.vertical {
     border-image: url("assets/trough-active-border-vertical.svg") 2 / 2 stretch;
 }
+*/
 
 /* column-headers borders */
 column-header.button,
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 229495b..88afe89 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-dark-overrides.css
@@ -21,5 +21,17 @@ GtkIconView.view.cell:selected:focused {
 
 GtkSwitch.slider {
     border-color: mix (@button_border, black, 0.4);
-    box-shadow: 0 -1 inset alpha(white, 0.1), 0 1 inset @theme_base_color, 0 2 inset alpha(@button_border, 0.15);
+    box-shadow: 0 -1 inset alpha(white, 0.07), 0 1 inset @theme_base_color, 0 2 inset alpha(@button_border, 0.15);
 }
+
+/* Don't ask me why I need this one, seems like a bug to me eh */
+GtkScale.trough,
+GtkScale.trough row,
+GtkScale.trough row:hover {
+    background-image: -gtk-gradient (linear,
+    				     left top, left bottom,
+                                     from (@button_border),
+				     to (shade(@theme_bg_color, 0.94)));
+    border-image: none;
+}
+
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index ef32d3b..00f5d67 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -314,33 +314,27 @@ GtkScale.slider:insensitive {
     /* background-image in -assets variant */
 }
 
-GtkScale.trough {
-    border-width: 1;
-    border-radius: 2;
-    border-style: none;
+GtkScale.trough,
+GtkScale.trough.vertical {
+/*    background-color: @scale_fill;
+    background-image: none;*/
 
-    background-color: @scale_fill;
-
-    /* border-image defined in the -assets variants */
+    border-width: 1;
+    border-image: none;
+    border-style: solid;
+    border-color: @button_border;
 }
 
 GtkScale.trough:insensitive {
     background-color: @insensitive_bg_color;
-    background-image: none;
-
-    border-image: none;
-    border-style: solid;
     border-color: @insensitive_border_color;
+    box-shadow: none;
+    background-image: none;
 }
 
 GtkScale.progressbar {
     background-color: @scale_progress_fill;
 
-    border-width: 1;
-    border-radius: 2;
-    border-style: none;
-    /* border-image defined in the -assets variants */
-
     -adwaita-progressbar-pattern: none;
 }
 
@@ -348,6 +342,14 @@ GtkScale.mark {
     color: shade (@theme_bg_color, 0.56);
 }
 
+GtkScale.trough.vertical {
+    box-shadow: -1 0 inset @theme_bg_color;
+}
+
+GtkScale.trough {
+    box-shadow: 0 -1 inset @theme_bg_color;
+}
+
 /**********
  * Frames *
  **********/
@@ -1257,11 +1259,6 @@ GtkSwitch {
     font: bold condensed 10;
 }
 
-GtkSwitch.trough {
-    border-radius: 3;
-    border-width: 1 1 2 1;
-}
-
 GtkSwitch.trough:active {
     color: @switch_trough_active_color;
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]