summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2011-08-16 10:59:14 +0200
committerCosimo Cecchi <cosimoc@gnome.org>2011-08-16 10:59:14 +0200
commit5b24fbab471d5ea8613e721e8a455887652af025 (patch)
tree31fbbf22742e0e69e3106dae270c23ea3f4cdc2c
parent60ed7bb0a89010aa330c2efd3e2395a0c331c26b (diff)
downloadgnome-themes-standard-5b24fbab471d5ea8613e721e8a455887652af025.tar.gz
combobox-entry: match new combobox-entry style on primary-toolbars
It needs an additional selector, as primary toolbar buttons already have a different style.
-rw-r--r--themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css3
-rw-r--r--themes/Adwaita/gtk-3.0/gtk-widgets-assets.css3
-rw-r--r--themes/Adwaita/gtk-3.0/gtk-widgets.css9
3 files changed, 14 insertions, 1 deletions
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 1a5e2ff5..e508bae4 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets-dark.css
@@ -72,6 +72,9 @@
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 {
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
index 0822d25a..a28afaf3 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-assets.css
@@ -72,10 +72,13 @@
border-image: url("assets/entry-border-focused.svg") 2 / 2 stretch;
}
+.primary-toolbar GtkComboBox.combobox-entry .button,
GtkComboBox.combobox-entry .button {
border-image: url("assets/entry-border-normal.svg") 2 / 2 2 2 0 stretch;
}
+.primary-toolbar GtkComboBox.combobox-entry .button:active,
+.primary-toolbar GtkComboBox.combobox-entry .button:hover:active,
GtkComboBox.combobox-entry .button:active,
GtkComboBox.combobox-entry .button:hover:active {
border-image: url("assets/combobox-entry-border-active.svg") 2 / 2 2 2 0 stretch;
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 2aca6341..f73c7159 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -140,7 +140,9 @@ GtkStatusbar {
.entry,
GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:prelight {
+GtkComboBox.combobox-entry .button:prelight,
+.primary-toolbar GtkComboBox.combobox-entry .button,
+.primary-toolbar GtkComboBox.combobox-entry .button:prelight {
background-image: -gtk-gradient(linear,
left top, left bottom,
from(@entry_background_a),
@@ -505,6 +507,7 @@ GtkComboBox .button *:prelight {
color: @theme_text_color;
}
+.primary-toolbar GtkComboBox.combobox-entry .button,
GtkComboBox.combobox-entry .button {
border-width: 1 1 1 0;
border-radius: 0 3 3 0;
@@ -513,11 +516,15 @@ GtkComboBox.combobox-entry .button {
-adwaita-focus-fill-color: alpha (@theme_base_color, 0.0);
}
+.primary-toolbar GtkComboBox.combobox-entry .button *:active,
+.primary-toolbar GtkComboBox.combobox-entry .button *:prelight,
GtkComboBox.combobox-entry .button *:active,
GtkComboBox.combobox-entry .button *:prelight {
color: @internal_element_prelight;
}
+.primary-toolbar GtkComboBox.combobox-entry .button:active,
+.primary-toolbar GtkComboBox.combobox-entry .button:hover:active,
GtkComboBox.combobox-entry .button:active,
GtkComboBox.combobox-entry .button:hover:active {
background-image: -gtk-gradient(linear,