[gnome-themes-standard] Widget theme: some more unfocused window work.
- From: Cosimo Cecchi <cosimoc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-themes-standard] Widget theme: some more unfocused window work.
- Date: Thu, 1 Dec 2011 02:29:20 +0000 (UTC)
commit a5ceb92dad05d913cbe8bb2bd7aea081802d3078
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Sun Nov 20 15:24:12 2011 +0100
Widget theme: some more unfocused window work.
themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css | 11 +++-
themes/Adwaita/gtk-3.0/gtk-widgets-borders.css | 64 +++++---------------
themes/Adwaita/gtk-3.0/gtk-widgets.css | 27 +++++++-
themes/Adwaita/gtk-3.0/gtk.css | 2 +
4 files changed, 51 insertions(+), 53 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index 9e44883..9e10969 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -114,7 +114,15 @@ GtkComboBox.combobox-entry .button:focus,
to(@entry_background_d));
}
-/* ComboboxEntry button background */
+/* Entry background for :window-unfocused */
+.entry:window-unfocused,
+GtkComboBox.combobox-entry .button:window-unfocused
+.primary-toolbar GtkComboBox.combobox-entry .button: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,
GtkComboBox.combobox-entry .button:active,
@@ -135,7 +143,6 @@ GtkComboBox.combobox-entry .button:insensitive {
}
/* Primary and inline toolbars background */
-
.primary-toolbar .toolbar,
.primary-toolbar.toolbar,
.inline-toolbar.toolbar {
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
index aa4ee84..d990c97 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders.css
@@ -38,23 +38,13 @@ GtkComboBox.combobox-entry .entry:focus,
border-width: 1 1 2 1;
}
-/* buttons border for window unfocused state*/
-
-.primary-toolbar .raised .button:window-unfocused {
- border-width: 1;
- border-style: solid;
- /*border-color: @theme_unfocused_border_color;*/
- border-color: @theme_unfocused_button_active_color;
- border-radius: 3;
-}
-
-.primary-toolbar .button:active:window-unfocused,
+/*.primary-toolbar .button:active:window-unfocused,
.primary-toolbar .raised .button:active:window-unfocused {
border-width: 1;
border-style: solid;
border-color: @theme_unfocused_border_color;
border-radius: 3;
-}
+}*/
/* primary toolbar - generic element borders */
@@ -78,27 +68,6 @@ GtkComboBox.combobox-entry .entry:focus,
border-width: 2;
}
-/* primary toolbar - generic element borders for window unfocused state */
-.primary-toolbar .entry:window-unfocused,
-.primary-toolbar GtkComboBox.combobox-entry .entry:window-unfocused,
-.primary-toolbar GtkComboBox.combobox-entry .button:window-unfocused,
-.primary-toolbar GtkComboBox.combobox-entry .button:prelight:window-unfocused,
-.primary-toolbar GtkComboBox.combobox-entry .button:active:window-unfocused,
-.primary-toolbar GtkComboBox.combobox-entry .button:focus:window-unfocused,
-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:window-unfocused,
-.primary-toolbar .raised .button:window-unfocused,
-.primary-toolbar .button:active:window-unfocused,
-.primary-toolbar .button:active:hover:window-unfocused,
-.primary-toolbar .button.raised:insensitive:window-unfocused,
-.primary-toolbar .raised .button:insensitive:window-unfocused,
-.primary-toolbar .raised .button:window-unfocused,
-.inline-toolbar.toolbar .button:active:window-unfocused,
-.inline-toolbar.toolbar .button:active:hover:window-unfocused,
-.inline-toolbar.toolbar .button:insensitive:window-unfocused,
-.inline-toolbar.toolbar GtkToolButton .button:active:window-unfocused {
- border-image: none;
-}
-
/* primary toolbar - focused element borders */
.primary-toolbar .entry:focus,
.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
@@ -180,23 +149,22 @@ GtkSwitch.slider:active {
border-image: url("assets/progressbar-border-vertical.svg") 3 / 3 stretch;
}
-/* border image removal for window unfocued stuf */
-.primary-toolbar .entry:window-unfocused,
+/* 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,
-.primary-toolbar GtkComboBox.combobox-entry .button:prelight:window-unfocused,
-.primary-toolbar GtkComboBox.combobox-entry .button:active:window-unfocused,
-.primary-toolbar GtkComboBox.combobox-entry .button:focus:window-unfocused,
-.primary-toolbar GtkComboBox.combobox-entry .button:insensitive:window-unfocused,
+.button:window-unfocused,
+.button:active:window-unfocused,
+.button:active:hover:window-unfocused,
+.button:insensitive:window-unfocused,
.primary-toolbar .raised .button:window-unfocused,
-.primary-toolbar .button:active:window-unfocused,
-.primary-toolbar .button:active:hover:window-unfocused,
-.primary-toolbar .button.raised:insensitive:window-unfocused,
-.primary-toolbar .raised .button:insensitive:window-unfocused,
-.primary-toolbar .raised .button:window-unfocused,
-.inline-toolbar.toolbar .button:active:window-unfocused,
-.inline-toolbar.toolbar .button:active:hover:window-unfocused,
-.inline-toolbar.toolbar .button:insensitive:window-unfocused,
-.inline-toolbar.toolbar GtkToolButton .button:active:window-unfocused {
+GtkComboBox: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 acb263d..33eafc7 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -424,7 +424,9 @@ GtkScrolledWindow.frame {
.primary-toolbar .button,
.primary-toolbar .button:hover,
.primary-toolbar .button:focus,
-.primary-toolbar .button:insensitive {
+.primary-toolbar .button:insensitive,
+.primary-toolbar .button:window-unfocused,
+.primary-toolbar .button:insensitive:window-unfocused {
border-image: none;
border-style: none;
border-width: 0;
@@ -765,8 +767,7 @@ GtkComboBox.combobox-entry .entry:first-child,
GtkComboBox.combobox-entry .entry:focus:first-child,
GtkComboBox.combobox-entry .button:first-child,
GtkComboBox.combobox-entry .button:focus:first-child,
-GtkComboBox.combobox-entry .button:insensitive:first-child,
-GtkComboBox.combobox-entry .button:active:first-child {
+GtkComboBox.combobox-entry .button:insensitive:first-child {
border-image-width: 3 0 4 3;
border-radius: 3 0 0 3;
border-right-width: 0;
@@ -783,6 +784,26 @@ 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,
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index cc49ad2..07ed992 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -7,6 +7,8 @@
@define-color fg_color #2e3436;
@define-color tooltip_fg_color #ffffff;
@define-color selected_fg_color #ffffff;
+/* define-color unfocused_bg_color #f8f8f8;*/
+ 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]