AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-28 06:21:14 +00:00
Code Issues Projects Releases Wiki Activity

Adwaita: fix places sidebar icons style

Browse Source 
the color wasn't changing in backdrop.
This commit is contained in:
Lapo Calamandrei 2016-03-19 20:13:06 +01:00
parent 0174803149
commit 397bacee6e
3 changed files with 128 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,7 @@ label {
} }
row:selected &, row:selected &,
&:selected { @extend %selected_items; } &:selected { @extend %nobg_selected_items; }
selection { selection {
background-color: $selected_bg_color; background-color: $selected_bg_color;
@ -3661,14 +3661,24 @@ placessidebar {
padding: 0 14px; padding: 0 14px;
} }
& image.sidebar-icon { image.sidebar-icon {
opacity: $_placesidebar_icons_opacity; // dim the device icons opacity: $_placesidebar_icons_opacity; // dim the device icons
&:dir(ltr) { padding-right: 8px; } &:dir(ltr) { padding-right: 8px; }
&:dir(rtl) { padding-left: 8px; } &:dir(rtl) { padding-left: 8px; }
&:disabled { color: $insensitive_fg_color; }
&:backdrop {
color: $backdrop_fg_color;
&:insensitivie { color: $backdrop_insensitive_color; }
}
} }
& label.sidebar-label { &:selected image.sidebar-icon { @extend %nobg_selected_items; }
label.sidebar-label {
&:dir(ltr) { padding-right: 2px; } &:dir(ltr) { padding-right: 2px; }
&:dir(rtl) { padding-left: 2px; } &:dir(rtl) { padding-left: 2px; }
} }
@ -4122,6 +4132,8 @@ headerbar.selection-mode button.titlebutton,
%selected_items { %selected_items {
background-color: $selected_bg_color; background-color: $selected_bg_color;
@at-root %nobg_selected_items, & {
color: $selected_fg_color; color: $selected_fg_color;
@if $variant == 'light' { outline-color: transparentize($selected_fg_color, 0.7); } @if $variant == 'light' { outline-color: transparentize($selected_fg_color, 0.7); }
@ -4133,6 +4145,7 @@ headerbar.selection-mode button.titlebutton,
&:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); } &:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
} }
}
} }
.monospace { font: Monospace; } .monospace { font: Monospace; }

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

@ -3799,6 +3799,12 @@ placessidebar row {
padding-right: 8px; } padding-right: 8px; }
placessidebar row image.sidebar-icon:dir(rtl) { placessidebar row image.sidebar-icon:dir(rtl) {
padding-left: 8px; } padding-left: 8px; }
placessidebar row image.sidebar-icon:disabled {
color: #949796; }
placessidebar row image.sidebar-icon:backdrop {
color: #949796; }
placessidebar row image.sidebar-icon:backdrop:insensitivie {
color: #5d6767; }
placessidebar row label.sidebar-label:dir(ltr) { placessidebar row label.sidebar-label:dir(ltr) {
padding-right: 2px; } padding-right: 2px; }
placessidebar row label.sidebar-label:dir(rtl) { placessidebar row label.sidebar-label:dir(rtl) {
@ -4189,40 +4195,53 @@ textview text:selected:focus,
iconview text:selected, iconview text:selected,
textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
textview text selection:focus, textview text selection:focus,
textview text selection, flowbox flowboxchild:selected, row:selected label, label:selected, spinbutton:not(.vertical) selection:focus, spinbutton:not(.vertical) selection, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection:focus, spinbutton:not(.vertical) selection,
entry selection:focus, entry selection:focus,
entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, entry selection, modelbutton.flat:selected, popover.background checkbutton:selected,
popover.background radiobutton:selected, popover.background radiobutton:selected,
.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, .sidebar :selected { .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, .sidebar :selected {
background-color: #215d9c; background-color: #215d9c; }
row:selected label, label:selected, placessidebar row:selected image.sidebar-icon, .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected,
.view text:selected:focus,
iconview text:selected:focus,
textview text:selected:focus,
.view text:selected,
iconview text:selected,
textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
textview text selection:focus,
textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection:focus, spinbutton:not(.vertical) selection,
entry selection:focus,
entry selection, modelbutton.flat:selected, popover.background checkbutton:selected,
popover.background radiobutton:selected,
.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, .sidebar :selected {
color: #ffffff; } color: #ffffff; }
iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, row:selected label:disabled, label:disabled:selected, placessidebar row:selected image.sidebar-icon:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected,
iconview text:disabled:selected:focus, iconview text:disabled:selected:focus,
textview text:disabled:selected:focus, textview text:disabled:selected:focus,
.view text:disabled:selected, .view text:disabled:selected,
iconview text:disabled:selected, iconview text:disabled:selected,
textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled,
textview text selection:disabled, flowbox flowboxchild:disabled:selected, row:selected label:disabled, label:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled, textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled,
entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected, entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected,
popover.background radiobutton:disabled:selected, popover.background radiobutton:disabled:selected,
.menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected { .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected {
color: #90aece; } color: #90aece; }
iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, row:selected label:backdrop, label:backdrop:selected, placessidebar row:selected image.sidebar-icon:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected,
iconview text:backdrop:selected:focus, iconview text:backdrop:selected:focus,
textview text:backdrop:selected:focus, textview text:backdrop:selected:focus,
.view text:backdrop:selected, .view text:backdrop:selected,
iconview text:backdrop:selected, iconview text:backdrop:selected,
textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop, textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop,
textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, row:selected label:backdrop, label:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop,
entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected, entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected,
popover.background radiobutton:backdrop:selected, popover.background radiobutton:backdrop:selected,
.menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected { .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected {
color: #ffffff; } color: #ffffff; }
.view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, row:selected label:backdrop:disabled, label:backdrop:disabled:selected, placessidebar row:selected image.sidebar-icon:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected,
.view text:backdrop:disabled:selected, .view text:backdrop:disabled:selected,
iconview text:backdrop:disabled:selected, iconview text:backdrop:disabled:selected,
textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled, textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled,
textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, row:selected label:backdrop:disabled, label:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, spinbutton:not(.vertical) selection:backdrop:disabled,
entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected, entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected,
popover.background radiobutton:backdrop:disabled:selected, popover.background radiobutton:backdrop:disabled:selected,
.menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected { .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected {

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

@ -3827,6 +3827,12 @@ placessidebar row {
padding-right: 8px; } padding-right: 8px; }
placessidebar row image.sidebar-icon:dir(rtl) { placessidebar row image.sidebar-icon:dir(rtl) {
padding-left: 8px; } padding-left: 8px; }
placessidebar row image.sidebar-icon:disabled {
color: #8b8e8f; }
placessidebar row image.sidebar-icon:backdrop {
color: #8b8e8f; }
placessidebar row image.sidebar-icon:backdrop:insensitivie {
color: #c3c3c0; }
placessidebar row label.sidebar-label:dir(ltr) { placessidebar row label.sidebar-label:dir(ltr) {
padding-right: 2px; } padding-right: 2px; }
placessidebar row label.sidebar-label:dir(rtl) { placessidebar row label.sidebar-label:dir(rtl) {
@ -4217,41 +4223,54 @@ textview text:selected:focus,
iconview text:selected, iconview text:selected,
textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection, textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
textview text selection:focus, textview text selection:focus,
textview text selection, flowbox flowboxchild:selected, row:selected label, label:selected, spinbutton:not(.vertical) selection:focus, spinbutton:not(.vertical) selection, textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection:focus, spinbutton:not(.vertical) selection,
entry selection:focus, entry selection:focus,
entry selection, modelbutton.flat:selected, popover.background checkbutton:selected, entry selection, modelbutton.flat:selected, popover.background checkbutton:selected,
popover.background radiobutton:selected, popover.background radiobutton:selected,
.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, .sidebar :selected { .menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, .sidebar :selected {
background-color: #4a90d9; background-color: #4a90d9; }
row:selected label, label:selected, placessidebar row:selected image.sidebar-icon, .view:selected:focus, iconview:selected:focus, .view:selected, iconview:selected,
.view text:selected:focus,
iconview text:selected:focus,
textview text:selected:focus,
.view text:selected,
iconview text:selected,
textview text:selected, .view text selection:focus, iconview text selection:focus, .view text selection, iconview text selection,
textview text selection:focus,
textview text selection, flowbox flowboxchild:selected, spinbutton:not(.vertical) selection:focus, spinbutton:not(.vertical) selection,
entry selection:focus,
entry selection, modelbutton.flat:selected, popover.background checkbutton:selected,
popover.background radiobutton:selected,
.menuitem.button.flat:selected, treeview.view:selected:focus, treeview.view:selected, row:selected, calendar:selected, .sidebar :selected {
color: #ffffff; color: #ffffff;
outline-color: rgba(255, 255, 255, 0.3); } outline-color: rgba(255, 255, 255, 0.3); }
iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected, row:selected label:disabled, label:disabled:selected, placessidebar row:selected image.sidebar-icon:disabled, iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected,
iconview text:disabled:selected:focus, iconview text:disabled:selected:focus,
textview text:disabled:selected:focus, textview text:disabled:selected:focus,
.view text:disabled:selected, .view text:disabled:selected,
iconview text:disabled:selected, iconview text:disabled:selected,
textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled, textview text:disabled:selected, iconview text selection:disabled:focus, .view text selection:disabled, iconview text selection:disabled,
textview text selection:disabled, flowbox flowboxchild:disabled:selected, row:selected label:disabled, label:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled, textview text selection:disabled, flowbox flowboxchild:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled,
entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected, entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected,
popover.background radiobutton:disabled:selected, popover.background radiobutton:disabled:selected,
.menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected { .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected {
color: #a5c8ec; } color: #a5c8ec; }
iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, row:selected label:backdrop, label:backdrop:selected, placessidebar row:selected image.sidebar-icon:backdrop, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected,
iconview text:backdrop:selected:focus, iconview text:backdrop:selected:focus,
textview text:backdrop:selected:focus, textview text:backdrop:selected:focus,
.view text:backdrop:selected, .view text:backdrop:selected,
iconview text:backdrop:selected, iconview text:backdrop:selected,
textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop, textview text:backdrop:selected, iconview text selection:backdrop:focus, .view text selection:backdrop, iconview text selection:backdrop,
textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, row:selected label:backdrop, label:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop, textview text selection:backdrop, flowbox flowboxchild:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop,
entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected, entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background checkbutton:backdrop:selected,
popover.background radiobutton:backdrop:selected, popover.background radiobutton:backdrop:selected,
.menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected { .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar :backdrop:selected {
color: #ffffff; } color: #ffffff; }
.view:backdrop:disabled:selected, iconview:backdrop:disabled:selected, row:selected label:backdrop:disabled, label:backdrop:disabled:selected, placessidebar row:selected image.sidebar-icon:backdrop:disabled, .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected,
.view text:backdrop:disabled:selected, .view text:backdrop:disabled:selected,
iconview text:backdrop:disabled:selected, iconview text:backdrop:disabled:selected,
textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled, textview text:backdrop:disabled:selected, .view text selection:backdrop:disabled, iconview text selection:backdrop:disabled,
textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, row:selected label:backdrop:disabled, label:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, textview text selection:backdrop:disabled, flowbox flowboxchild:backdrop:disabled:selected, label:disabled selection:backdrop, label:backdrop selection:disabled, spinbutton:not(.vertical) selection:backdrop:disabled,
entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected, entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected,
popover.background radiobutton:backdrop:disabled:selected, popover.background radiobutton:backdrop:disabled:selected,
.menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected { .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected {