AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-16 13:40:31 +00:00
Code Issues Projects Releases Wiki Activity

HC: use child istead of descendant selectors for linking

Browse Source 
Since widgets subelements are now both widget childs and widget
classes, say .spinbutton.button and .spinbutton .button,
the linking logic needs to be adapted to be stricter with
child selectors. This fixes vertically linked spinbuttons.
This commit is contained in:
Jakub Steiner 2014-12-03 11:42:06 +01:00
parent 88a12fe777
commit 66dfdc3cc2
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/theme/HighContrast/_common.scss
View File

@ -440,17 +440,17 @@ $_dot_color: $selected_bg_color;
// -GtkWidget-wide-separators: true; // -GtkWidget-wide-separators: true;
// -GtkWidget-horizontal-separator: 0; // -GtkWidget-horizontal-separator: 0;
// } // }
.linked &, .linked > &,
.linked &:hover, .linked > &:hover,
.linked &:active, .linked > &:active,
.linked &:checked, .linked > &:checked,
.linked &:backdrop { @extend %linked; } .linked > &:backdrop { @extend %linked; }
.linked.vertical &, .linked.vertical > &,
.linked.vertical &:hover, .linked.vertical > &:hover,
.linked.vertical &:active, .linked.vertical > &:active,
.linked.vertical &:checked, .linked.vertical > &:checked,
.linked.vertical &:backdrop { @extend %linked_vertical; } .linked.vertical > &:backdrop { @extend %linked_vertical; }
} }
// all the following is for the +|- buttons on inline toolbars, that way // all the following is for the +|- buttons on inline toolbars, that way

20
gtk/theme/HighContrast/gtk.css
View File

@ -693,39 +693,39 @@
.sidebar-item.needs-attention > .label:dir(rtl) { .sidebar-item.needs-attention > .label:dir(rtl) {
background-position: left 3px, left 4px; } background-position: left 3px, left 4px; }
.osd .button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .osd .button:backdrop, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked .button, .linked .button:hover, .linked .button:active, .linked .button:checked, .linked .button:backdrop, .linked > GtkComboBox > .button:dir(ltr) { .osd .button, .osd .button:hover, .osd .button:active, .osd .button:checked, .osd .button:insensitive, .osd .button:backdrop, .inline-toolbar .button, .inline-toolbar .button:backdrop, .linked > .button, .linked > .button:hover, .linked > .button:active, .linked > .button:checked, .linked > .button:backdrop, .linked > GtkComboBox > .button:dir(ltr) {
border-radius: 0; border-radius: 0;
border-left-style: none; } border-left-style: none; }
.osd .button:dir(rtl), .inline-toolbar .button:dir(rtl), .linked .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) { .osd .button:dir(rtl), .inline-toolbar .button:dir(rtl), .linked > .button:dir(rtl), .linked > GtkComboBox > .button:dir(rtl) {
border-radius: 0; border-radius: 0;
border-right-style: none; border-right-style: none;
border-left-style: solid; } border-left-style: solid; }
.osd .button:first-child, .inline-toolbar .button:first-child, .linked .button:first-child, .linked > GtkComboBox:first-child > .button { .osd .button:first-child, .inline-toolbar .button:first-child, .linked > .button:first-child, .linked > GtkComboBox:first-child > .button {
border-radius: 3px 0 0 3px; border-radius: 3px 0 0 3px;
border-left-style: solid; } border-left-style: solid; }
.osd .button:last-child, .inline-toolbar .button:last-child, .linked .button:last-child, .linked > GtkComboBox:last-child > .button { .osd .button:last-child, .inline-toolbar .button:last-child, .linked > .button:last-child, .linked > GtkComboBox:last-child > .button {
border-radius: 0 3px 3px 0; } border-radius: 0 3px 3px 0; }
.osd .button:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) { .osd .button:last-child:dir(rtl), .inline-toolbar .button:last-child:dir(rtl), .linked > .button:last-child:dir(rtl), .linked > GtkComboBox:last-child > .button:dir(rtl) {
border-right-style: solid; } border-right-style: solid; }
.osd .button:only-child, .inline-toolbar .button:only-child, .linked .button:only-child, .linked > GtkComboBox:only-child > .button { .osd .button:only-child, .inline-toolbar .button:only-child, .linked > .button:only-child, .linked > GtkComboBox:only-child > .button {
border-radius: 3px; border-radius: 3px;
border-style: solid; } border-style: solid; }
.linked.vertical .entry, .linked.vertical .entry:focus, .linked.vertical .entry:insensitive, .linked.vertical .entry:insensitive:backdrop, .linked.vertical .entry:backdrop, .linked.vertical .button, .linked.vertical .button:hover, .linked.vertical .button:active, .linked.vertical .button:checked, .linked.vertical .button:backdrop, .linked.vertical > GtkComboBoxText > .button, .linked.vertical .entry, .linked.vertical .entry:focus, .linked.vertical .entry:insensitive, .linked.vertical .entry:insensitive:backdrop, .linked.vertical .entry:backdrop, .linked.vertical > .button, .linked.vertical > .button:hover, .linked.vertical > .button:active, .linked.vertical > .button:checked, .linked.vertical > .button:backdrop, .linked.vertical > GtkComboBoxText > .button,
.linked.vertical > GtkComboBox > .button { .linked.vertical > GtkComboBox > .button {
border-left-style: solid; border-left-style: solid;
border-top-style: none; border-top-style: none;
border-radius: 0; } border-radius: 0; }
.linked.vertical .entry:first-child, .linked.vertical .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button, .linked.vertical .entry:first-child, .linked.vertical > .button:first-child, .linked.vertical > GtkComboBoxText:first-child > .button,
.linked.vertical > GtkComboBox:first-child > .button { .linked.vertical > GtkComboBox:first-child > .button {
border-style: solid; border-style: solid;
border-radius: 3px 3px 0 0; } border-radius: 3px 3px 0 0; }
.linked.vertical .entry:last-child, .linked.vertical .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button, .linked.vertical .entry:last-child, .linked.vertical > .button:last-child, .linked.vertical > GtkComboBoxText:last-child > .button,
.linked.vertical > GtkComboBox:last-child > .button { .linked.vertical > GtkComboBox:last-child > .button {
border-radius: 0 0 3px 3px; } border-radius: 0 0 3px 3px; }
.linked.vertical .entry:only-child, .linked.vertical .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button, .linked.vertical .entry:only-child, .linked.vertical > .button:only-child, .linked.vertical > GtkComboBoxText:only-child > .button,
.linked.vertical > GtkComboBox:only-child > .button { .linked.vertical > GtkComboBox:only-child > .button {
border-radius: 3px; border-radius: 3px;
border-style: solid; } border-style: solid; }