[gnome-themes-standard/lapo-work: 8/29] Widget theme: moved all :window-unfocused stuff to a new file (commented out in gtk.css for now), si

From: Cosimo Cecchi <cosimoc src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-themes-standard/lapo-work: 8/29] Widget theme: moved all :window-unfocused stuff to a new file (commented out in gtk.css for now), si
Date: Tue, 29 Nov 2011 01:47:27 +0000 (UTC)
commit 2c531bba56d0b89880a9a2bf1b8d61f605ef9e9e
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Mon Nov 21 13:29:04 2011 +0100

    Widget theme: moved all :window-unfocused stuff to a new file (commented out in gtk.css for now), since it almost never intersect with other stuff.

 themes/Adwaita/gtk-3.0/Makefile.am                 |    1 +
 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |   52 +--------
 themes/Adwaita/gtk-3.0/gtk-widgets-borders.css     |   22 +---
 .../gtk-3.0/gtk-widgets-window-unfocused.css       |  132 ++++++++++++++++++++
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   46 +-------
 themes/Adwaita/gtk-3.0/gtk.css                     |    3 +-
 6 files changed, 138 insertions(+), 118 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/Makefile.am b/themes/Adwaita/gtk-3.0/Makefile.am
index d2c8633..03da379 100644
--- a/themes/Adwaita/gtk-3.0/Makefile.am
+++ b/themes/Adwaita/gtk-3.0/Makefile.am
@@ -11,6 +11,7 @@ theme_DATA = 		\
 	gtk-widgets-dark-overrides.css \
 	gtk-widgets-assets.css \
 	gtk-widgets-assets-dark.css \
+	gtk-widgets-window-unfocused.css \
 	settings.ini
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index 1d89707..0d1d4c9 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -12,28 +12,6 @@
                                      to (@button_gradient_color_b));
 }
 
-/* Button background :window-unfocused */
-.button:window-unfocused,
-.primary-toolbar .button.raised:window-unfocused,
-.primary-toolbar .raised .button:window-unfocused {
-    background-image: none;
-    background-color: @theme_unfocused_bg_color;
-}
-
-/* Primary toolbar button background :window-unfocused */
-.primary-toolbar .button:window-unfocused,
-.primary-toolbar .button:hover:window-unfocused {
-    background-image: none;
-    background-color: transparent;
-}
-
-/* Button background :hover :window-unfocused */
-.primary-toolbar .button.raised:hover:window-unfocused,
-.primary-toolbar .raised .button:hover:window-unfocused {
-    background-image: none;
-    background-color: shade(@theme_unfocused_bg_color, 1.2);
-}
-
 /* Pushed button background */
 .button:active,
 .button:hover:active,
@@ -58,16 +36,6 @@ GtkSwitch.trough {
 				     to (alpha (@button_active_gradient_color_b, 0.13)));
 }
 
-/* Pushed buttons background for window unfocused state */
-.button:active:window-unfocused,
-.button:hover:active:window-unfocused,
-.toolbar .button:active:window-unfocused,
-.toolbar .button:hover:active:window-unfocused,
-.primary-toolbar .button:active:window-unfocused {
-    background-image: none;
-    background-color: @theme_unfocused_button_active_color;
-}
-
 /* Prelit button background */
 .button:hover,
 .toolbar .button:hover,
@@ -126,16 +94,6 @@ GtkComboBox.combobox-entry .button:focus,
                                     to(@entry_background_d));
 }
 
-/* Entry background for :window-unfocused */
-.entry:window-unfocused,
-GtkComboBox.combobox-entry .button:window-unfocused
-.primary-toolbar GtkComboBox.combobox-entry .button:window-unfocused,
-GtkSwitch.trough:window-unfocused,
-GtkSwitch.trough:active:window-unfocused {
-    background-image: none;
-    background-color: @theme_base_color;
-}
-
 /* ComboboxEntry pushed button background */
 .primary-toolbar GtkComboBox.combobox-entry .button:active,
 .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,
@@ -151,8 +109,7 @@ GtkComboBox.combobox-entry .button:hover:active {
 
 /* Insensitive entry background */
 .entry:insensitive,
-GtkComboBox.combobox-entry .button:insensitive,
-.entry:insensitive:window-unfocused {
+GtkComboBox.combobox-entry .button:insensitive {
     background-color: @insensitive_bg_color;
     background-image: none;
 }
@@ -170,13 +127,6 @@ GtkComboBox.combobox-entry .button:insensitive,
 				     to (@toolbar_gradient_final));
 }
 
-.primary-toolbar .toolbar:window-unfocused,
-.primary-toolbar.toolbar:window-unfocused,
-.inline-toolbar.toolbar:window-unfocused  {
-    background-image: none;
-    background-color: @theme_unfocused_toolbar_color;
-}
-
 /* Active switch background*/
 GtkSwitch.trough:active {
     background-image: -gtk-gradient (linear,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index acbcf23..7ea8c6a 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -134,24 +134,4 @@ GtkScale.progressbar.vertical {
     border-image: url("assets/trough-active-border-vertical.svg") 2 / 2 stretch;
 }
 
-/* generic element borders for :window-unfocused */
-.entry:window-unfocused,
-GtkComboBox.combobox-entry .entry:window-unfocused,
-GtkComboBox.combobox-entry .button:window-unfocused,
-.primary-toolbar GtkComboBox.combobox-entry .entry:window-unfocused,
-.primary-toolbar GtkComboBox.combobox-entry .button:window-unfocused,
-.button:window-unfocused,
-.button:active:window-unfocused,
-.button:active:hover:window-unfocused,
-.button:insensitive:window-unfocused,
-.primary-toolbar .raised .button:window-unfocused,
-GtkComboBox .button:window-unfocused,
-GtkSwitch.through:window-unfocused,
-GtkSwitch.through:active:window-unfocused {
-    border-image: none;
-    border-width: 1;
-    border-style: solid;
-    border-color: @theme_unfocused_button_active_color;
-    /*border-color: red;*/
-    border-radius: 3;
-}
+
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-window-unfocused.css b/themes/Adwaita/gtk-3.0/gtk-widgets-window-unfocused.css
new file mode 100644
index 0000000..083af9a
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-window-unfocused.css
@@ -0,0 +1,132 @@
+GtkWindow:window-unfocused {
+    background-color: @theme_unfocused_bg_color;
+}
+
+*:window-unfocused {
+    color: @insensitive_fg_color;
+}
+
+*:insensitive:window-unfocused {
+    color: mix (@theme_unfocused_bg_color, @insensitive_fg_color, 0.5);
+}
+
+.menubar:window-unfocused {
+    background-color: @theme_unfocused_bg_color;
+}
+
+.toolbar:window-unfocused {
+    background-color: @theme_unfocused_bg_color;
+}
+
+.primary-toolbar .toolbar:window-unfocused,
+.primary-toolbar.toolbar:window-unfocused {
+    border-color: @theme_unfocused_toolbar_color;
+}
+
+.primary-toolbar .toolbar:window-unfocused,
+.primary-toolbar.toolbar:window-unfocused,
+.inline-toolbar.toolbar:window-unfocused  {
+    background-image: none;
+    background-color: @theme_unfocused_toolbar_color;
+}
+
+.primary-toolbar .button:window-unfocused,
+.primary-toolbar .button:insensitive:window-unfocused {
+    border-image: none;
+    border-style: none;
+    border-width: 0;
+}
+
+/* Button background :window-unfocused */
+.button:window-unfocused,
+.primary-toolbar .button.raised:window-unfocused,
+.primary-toolbar .raised .button:window-unfocused {
+    background-image: none;
+    background-color: @theme_unfocused_bg_color;
+}
+
+/* Primary toolbar button background :window-unfocused */
+.primary-toolbar .button:window-unfocused,
+.primary-toolbar .button:hover:window-unfocused {
+    background-image: none;
+    background-color: transparent;
+}
+
+/* Button background :hover :window-unfocused */
+.primary-toolbar .button.raised:hover:window-unfocused,
+.primary-toolbar .raised .button:hover:window-unfocused {
+    background-image: none;
+    background-color: shade(@theme_unfocused_bg_color, 1.2);
+}
+
+/* Pushed buttons background for window unfocused state */
+.button:active:window-unfocused,
+.button:hover:active:window-unfocused,
+.toolbar .button:active:window-unfocused,
+.toolbar .button:hover:active:window-unfocused,
+.primary-toolbar .button:active:window-unfocused {
+    background-image: none;
+    background-color: @theme_unfocused_button_active_color;
+}
+
+/* Entry background */
+.entry:window-unfocused,
+GtkComboBox.combobox-entry .button:window-unfocused
+.primary-toolbar GtkComboBox.combobox-entry .button:window-unfocused,
+GtkSwitch.trough:window-unfocused,
+GtkSwitch.trough:active:window-unfocused {
+    background-image: none;
+    background-color: @theme_base_color;
+}
+
+.entry:insensitive:window-unfocused {
+    background-color: @insensitive_bg_color;
+    background-image: none;
+}
+
+GtkComboBox.combobox-entry .button:active:first-child:window-unfocused,
+GtkComboBox.combobox-entry .entry:first-child:window-unfocused,
+GtkComboBox.combobox-entry .button:first-child:window-unfocused,
+GtkComboBox.combobox-entry .button:insensitive:first-child:window-unfocused,
+GtkComboBox.combobox-entry .button:active:first-child:window-unfocused {
+    border-width: 1 0 1 1;
+    border-radius: 3 0 0 3;
+    border-right-width: 0;
+}
+
+GtkComboBox.combobox-entry .button:active:last-child:window-unfocused,
+GtkComboBox.combobox-entry .entry:last-child:window-unfocused,
+GtkComboBox.combobox-entry .button:last-child:window-unfocused,
+GtkComboBox.combobox-entry .button:insensitive:last-child:window-unfocused,
+GtkComboBox.combobox-entry .button:active:last-child:window-unfocused {
+    border-width: 1 1 1 0;
+    border-radius: 0 3 3 0;
+    border-left-width: 0;
+}
+
+GtkSwitch.slider:window-unfocused,
+GtkSwitch.slider:active:window-unfocused {
+    border-color: @theme_unfocused_button_active_color;;
+}
+
+/* generic element borders for :window-unfocused */
+.entry:window-unfocused,
+GtkComboBox.combobox-entry .entry:window-unfocused,
+GtkComboBox.combobox-entry .button:window-unfocused,
+.primary-toolbar GtkComboBox.combobox-entry .entry:window-unfocused,
+.primary-toolbar GtkComboBox.combobox-entry .button:window-unfocused,
+.button:window-unfocused,
+.button:active:window-unfocused,
+.button:active:hover:window-unfocused,
+.button:insensitive:window-unfocused,
+.primary-toolbar .raised .button:window-unfocused,
+GtkComboBox .button:window-unfocused,
+GtkSwitch.through:window-unfocused,
+GtkSwitch.through:active:window-unfocused {
+    border-image: none;
+    border-width: 1;
+    border-style: solid;
+    border-color: @theme_unfocused_button_active_color;
+    /*border-color: red;*/
+    border-radius: 3;
+}
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index e9a6008..93d9911 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -50,22 +50,10 @@ GtkWindow {
     color: @theme_fg_color;
 }
 
-GtkWindow:window-unfocused {
-    background-color: @theme_unfocused_bg_color;
-}
-
 * {
     background-color: @theme_bg_color;
 }
 
-*:window-unfocused {
-    color: @insensitive_fg_color;
-}
-
-*:insensitive:window-unfocused {
-    color: mix (@theme_unfocused_bg_color, @insensitive_fg_color, 0.5);
-}
-
 *:hover {
     background-color: shade (@theme_bg_color, 1.02);
     color: @theme_fg_color;
@@ -413,9 +401,7 @@ GtkScrolledWindow.frame {
 .primary-toolbar .button,
 .primary-toolbar .button:hover,
 .primary-toolbar .button:focus,
-.primary-toolbar .button:insensitive,
-.primary-toolbar .button:window-unfocused,
-.primary-toolbar .button:insensitive:window-unfocused {
+.primary-toolbar .button:insensitive {
     border-image: none;
     border-style: none;
     border-width: 0;
@@ -773,26 +759,6 @@ GtkComboBox.combobox-entry .button:active:last-child {
     border-left-width: 0;
 }
 
-GtkComboBox.combobox-entry .button:active:first-child:window-unfocused,
-GtkComboBox.combobox-entry .entry:first-child:window-unfocused,
-GtkComboBox.combobox-entry .button:first-child:window-unfocused,
-GtkComboBox.combobox-entry .button:insensitive:first-child:window-unfocused,
-GtkComboBox.combobox-entry .button:active:first-child:window-unfocused {
-    border-width: 1 0 1 1;
-    border-radius: 3 0 0 3;
-    border-right-width: 0;
-}
-
-GtkComboBox.combobox-entry .button:active:last-child:window-unfocused,
-GtkComboBox.combobox-entry .entry:last-child:window-unfocused,
-GtkComboBox.combobox-entry .button:last-child:window-unfocused,
-GtkComboBox.combobox-entry .button:insensitive:last-child:window-unfocused,
-GtkComboBox.combobox-entry .button:active:last-child:window-unfocused {
-    border-width: 1 1 1 0;
-    border-radius: 0 3 3 0;
-    border-left-width: 0;
-}
-
 .primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
 .primary-toolbar GtkComboBox.combobox-entry .entry:focus:first-child,
 .primary-toolbar GtkComboBox.combobox-entry .button:first-child,
@@ -1185,11 +1151,6 @@ GtkTreeMenu .menuitem * {
     -GtkToolbar-button-relief: normal;
 }
 
-.primary-toolbar .toolbar:window-unfocused,
-.primary-toolbar.toolbar:window-unfocused {
-    border-color: @theme_unfocused_toolbar_color;
-}
-
 .primary-toolbar .toolbar:insensitive,
 .primary-toolbar.toolbar:insensitive {
     background-image: none;
@@ -1316,11 +1277,6 @@ GtkSwitch.slider {
     -adwaita-switch-grip-color: shade (@switch_slider_color, 0.97);
 }
 
-GtkSwitch.slider:window-unfocused,
-GtkSwitch.slider:active:window-unfocused {
-    border-color: @theme_unfocused_button_active_color;;
-}
-
 GtkSwitch.slider:active {
     border-color: @switch_slider_active_border;
 }
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index ba1fe3b..a930700 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -171,4 +171,5 @@
 @import url("gtk-widgets-borders.css");
 @import url("gtk-widgets-assets.css");
 @import url("gnome-applications.css");
- import url("gtk-widgets.css"); /* I want this file to be the last to ovverride things */
+ import url("gtk-widgets.css");
+/* @import url("gtk-widgets-window-unfocused.css"); */
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]