Merge branch 'wip/jimmac/error-entries-and-labels-gtk3' into 'gtk-3-24'

Adwaita: error labels and entries

See merge request GNOME/gtk!2441
This commit is contained in:
Matthias Clasen 2020-08-15 13:10:30 +00:00
commit 653251f69e
3 changed files with 12 additions and 0 deletions

View File

@ -205,6 +205,8 @@ label {
&:backdrop {
selection { @extend %selected_items_backdrop; }
}
&.error { color: $error_color; }
}
.dim-label {
@ -473,6 +475,8 @@ entry {
+ combobox > box > button.combo { border-top-color: $drop_target_color; }
}
}
&.error { color: $error_color; }
}
treeview entry {

View File

@ -57,6 +57,8 @@ label:disabled:backdrop { color: #5b5b5b; }
button label:disabled:backdrop { color: inherit; }
label.error { color: #cc0000; }
.dim-label, .titlebar:not(headerbar) .subtitle, headerbar .subtitle, label.separator { opacity: 0.55; text-shadow: none; }
assistant .sidebar { background-color: #2d2d2d; border-top: 1px solid #1b1b1b; }
@ -178,6 +180,8 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun
.linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:drop(active):not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:drop(active):not(:only-child) + entry, .linked.vertical > entry:drop(active):not(:only-child) + button, .linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: #4e9a06; }
spinbutton.error:not(.vertical), entry.error { color: #cc0000; }
treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) { background-color: #2d2d2d; transition-property: color, background; }
treeview entry.flat, treeview entry { border-radius: 0; background-image: none; background-color: #2d2d2d; }

View File

@ -57,6 +57,8 @@ label:disabled:backdrop { color: #d4cfca; }
button label:disabled:backdrop { color: inherit; }
label.error { color: #cc0000; }
.dim-label, .titlebar:not(headerbar) .subtitle, headerbar .subtitle, label.separator { opacity: 0.55; text-shadow: none; }
assistant .sidebar { background-color: #ffffff; border-top: 1px solid #cdc7c2; }
@ -178,6 +180,8 @@ spinbutton:not(.vertical) progress:backdrop, entry progress:backdrop { backgroun
.linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:drop(active):not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > entry:drop(active):not(:only-child) + spinbutton:not(.vertical), .linked.vertical > entry:drop(active):not(:only-child) + entry, .linked.vertical > entry:drop(active):not(:only-child) + button, .linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { border-top-color: #4e9a06; }
spinbutton.error:not(.vertical), entry.error { color: #cc0000; }
treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) { background-color: #ffffff; transition-property: color, background; }
treeview entry.flat, treeview entry { border-radius: 0; background-image: none; background-color: #ffffff; }