AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Adwaita: Redo combo box entry styling

Browse Source 
Instead of relying on .linked or + (which doesn't work right in rtl),
use :not(:only-child) to select a button that is not alone inside a
combobox.
This commit is contained in:
Matthias Clasen 2015-11-05 19:15:43 -05:00
parent f1b7005ede
commit 6be2073740
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/theme/Adwaita/_common.scss
View File

@ -959,7 +959,7 @@ combobox {
// always disable separators
-GtkWidget-wide-separators: true;
}
& entry.combo {
& > entry.combo {
&:dir(ltr) {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
@ -969,7 +969,7 @@ combobox {
border-bottom-left-radius: 0;
}
}
& button.combo {
& > button.combo:not(:only-child) {
&:dir(ltr) {
border-top-left-radius: 0;
border-bottom-left-radius: 0;

10
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -1460,17 +1460,19 @@ combobox {
text-shadow: none; }
combobox.separator.vertical {
-GtkWidget-wide-separators: true; }
combobox entry.combo:dir(ltr), combobox spinbutton.combo:dir(ltr) {
combobox > entry.combo:dir(ltr), combobox > spinbutton.combo:dir(ltr) {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
combobox entry.combo:dir(rtl), combobox spinbutton.combo:dir(rtl) {
combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) {
border-top-left-radius: 0;
border-bottom-left-radius: 0; }
combobox button.combo:dir(ltr) {
combobox > button.combo:not(:only-child):dir(ltr), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(ltr),
.titlebar combobox > button.combo.titlebutton:not(:only-child):dir(ltr) {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
combobox button.combo:dir(rtl) {
combobox > button.combo:not(:only-child):dir(rtl), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(rtl),
.titlebar combobox > button.combo.titlebutton:not(:only-child):dir(rtl) {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-right-style: none; }

10
gtk/theme/Adwaita/gtk-contained.css
View File

@ -1460,17 +1460,19 @@ combobox {
text-shadow: none; }
combobox.separator.vertical {
-GtkWidget-wide-separators: true; }
combobox entry.combo:dir(ltr), combobox spinbutton.combo:dir(ltr) {
combobox > entry.combo:dir(ltr), combobox > spinbutton.combo:dir(ltr) {
border-top-right-radius: 0;
border-bottom-right-radius: 0; }
combobox entry.combo:dir(rtl), combobox spinbutton.combo:dir(rtl) {
combobox > entry.combo:dir(rtl), combobox > spinbutton.combo:dir(rtl) {
border-top-left-radius: 0;
border-bottom-left-radius: 0; }
combobox button.combo:dir(ltr) {
combobox > button.combo:not(:only-child):dir(ltr), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(ltr),
.titlebar combobox > button.combo.titlebutton:not(:only-child):dir(ltr) {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
border-left-style: none; }
combobox button.combo:dir(rtl) {
combobox > button.combo:not(:only-child):dir(rtl), headerbar combobox > button.combo.titlebutton:not(:only-child):dir(rtl),
.titlebar combobox > button.combo.titlebutton:not(:only-child):dir(rtl) {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
border-right-style: none; }