From 900af619c3291fcacf7b129554f5ff4da7ca713c Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 3 Mar 2016 11:56:24 +0100 Subject: fix comboboxes --- common/gtk-3.0/3.20/sass/_common.scss | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'common/gtk-3.0/3.20/sass/_common.scss') diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss index 2027c32..f404cb3 100644 --- a/common/gtk-3.0/3.20/sass/_common.scss +++ b/common/gtk-3.0/3.20/sass/_common.scss @@ -566,7 +566,7 @@ toolbar.inline-toolbar toolbutton { > entry#{$e_type}:focus:not(:only-child) { + entry, + button, - + combobox > button.combo { border-#{$_border}-color: if($var=='light', $e_color, $e_border); } + + combobox > box > button.combo { border-#{$_border}-color: if($var=='light', $e_color, $e_border); } } } > button:checked + entry { border-#{$_border}-color: if($var=='light', $selected_bg_color, $e_border); } @@ -782,21 +782,21 @@ combobox { } } - .linked > & > button.combo { + .linked > & > box > button.combo { // the combobox is a composite widget so the way we do button linking doesn't // work, special case needed. &:dir(ltr), &:dir(rtl) { @extend %linked_middle; } // specificity bump } - .linked:not(.vertical) > &:first-child > button.combo { @extend %linked:first-child; } - .linked:not(.vertical) > &:last-child > button.combo { @extend %linked:last-child; } - .linked:not(.vertical) > &:only-child > button.combo { @extend %linked:only-child; } + .linked:not(.vertical) > &:first-child > box > button.combo { @extend %linked:first-child; } + .linked:not(.vertical) > &:last-child > box > button.combo { @extend %linked:last-child; } + .linked:not(.vertical) > &:only-child > box > button.combo { @extend %linked:only-child; } - .linked.vertical > & > button.combo { @extend %linked_vertical_middle; } - .linked.vertical > &:first-child > button.combo { @extend %linked_vertical:first-child; } - .linked.vertical > &:last-child > button.combo { @extend %linked_vertical:last-child; } - .linked.vertical > &:only-child > button.combo { @extend %linked_vertical:only-child; } + .linked.vertical > & > box > button.combo { @extend %linked_vertical_middle; } + .linked.vertical > &:first-child > box > button.combo { @extend %linked_vertical:first-child; } + .linked.vertical > &:last-child > box > button.combo { @extend %linked_vertical:last-child; } + .linked.vertical > &:only-child > box > button.combo { @extend %linked_vertical:only-child; } } // -- cgit v1.2.3