summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2015-01-10 20:25:56 -0500
committerMatthias Clasen <mclasen@redhat.com>2015-01-10 20:25:56 -0500
commit9c4d478dc77ae8f390c94b26b5148d8bb1c4472e (patch)
tree8c12f840ede635decdca87b5f2dedcaab95f83e7
parent35a8d3d7706defaf2fb445c201d59960eff0fba9 (diff)
downloadgtk+-9c4d478dc77ae8f390c94b26b5148d8bb1c4472e.tar.gz
Adwaita: draw combo box separators
Killing the separator in the button had the unintended side effect of also killing separators in the popup. https://bugzilla.gnome.org/show_bug.cgi?id=742704
-rw-r--r--gtk/theme/Adwaita/_common.scss2
-rw-r--r--gtk/theme/Adwaita/gtk-contained-dark.css4
-rw-r--r--gtk/theme/Adwaita/gtk-contained.css4
3 files changed, 3 insertions, 7 deletions
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index cf1a559931..0118084326 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1041,7 +1041,7 @@ GtkComboBox {
color: $backdrop_insensitive_color;
}
.menuitem { text-shadow: none; }
- .separator {
+ .separator.vertical {
// always disable separators
-GtkWidget-wide-separators: true;
-GtkWidget-horizontal-separator: 0;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index d66e64187e..428b59493d 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1530,9 +1530,7 @@ GtkComboBox {
color: #5d6767; }
GtkComboBox .menuitem {
text-shadow: none; }
- GtkComboBox .separator, GtkComboBox GtkPlacesSidebar.sidebar .view .separator, GtkPlacesSidebar.sidebar .view GtkComboBox .separator,
- GtkComboBox GtkPlacesSidebar.sidebar .view .separator:backdrop,
- GtkPlacesSidebar.sidebar .view GtkComboBox .separator:backdrop {
+ GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkComboBox .vertical.separator {
-GtkWidget-wide-separators: true;
-GtkWidget-horizontal-separator: 0;
-GtkWidget-vertical-separator: 0; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index fb9c9a135b..a66d01f506 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1530,9 +1530,7 @@ GtkComboBox {
color: #c7c7c7; }
GtkComboBox .menuitem {
text-shadow: none; }
- GtkComboBox .separator, GtkComboBox GtkPlacesSidebar.sidebar .view .separator, GtkPlacesSidebar.sidebar .view GtkComboBox .separator,
- GtkComboBox GtkPlacesSidebar.sidebar .view .separator:backdrop,
- GtkPlacesSidebar.sidebar .view GtkComboBox .separator:backdrop {
+ GtkComboBox .separator.vertical, GtkComboBox GtkPlacesSidebar.sidebar .view .vertical.separator, GtkPlacesSidebar.sidebar .view GtkComboBox .vertical.separator {
-GtkWidget-wide-separators: true;
-GtkWidget-horizontal-separator: 0;
-GtkWidget-vertical-separator: 0; }