[gtk+] Adwaita: fix places sidebar icons style

[Lapo Calamandrei <lapo src gnome org>]

commit 397bacee6ecb0223c5492551bb3a39020fd6c389
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Sat Mar 19 20:13:06 2016 +0100

    Adwaita: fix places sidebar icons style
    
    the color wasn't changing in backdrop.

 gtk/theme/Adwaita/_common.scss           |   31 +++++++---
 gtk/theme/Adwaita/gtk-contained-dark.css |   85 +++++++++++++++++-----------
 gtk/theme/Adwaita/gtk-contained.css      |   89 ++++++++++++++++++------------
 3 files changed, 128 insertions(+), 77 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 293df94..3fb09c3 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -151,7 +151,7 @@ label {
   }
 
   row:selected &,
-  &:selected { @extend %selected_items; }
+  &:selected { @extend %nobg_selected_items; }
 
   selection {
     background-color: $selected_bg_color;
@@ -3661,14 +3661,24 @@ placessidebar {
       padding: 0 14px;
     }
 
-    & image.sidebar-icon {
+    image.sidebar-icon {
       opacity: $_placesidebar_icons_opacity; // dim the device icons
 
       &:dir(ltr) { padding-right: 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(rtl) { padding-left: 2px; }
     }
@@ -4122,16 +4132,19 @@ headerbar.selection-mode button.titlebutton,
 
 %selected_items {
   background-color: $selected_bg_color;
-  color: $selected_fg_color;
 
-  @if $variant == 'light' { outline-color: transparentize($selected_fg_color, 0.7); }
+  @at-root %nobg_selected_items, & {
+    color: $selected_fg_color;
 
-  &:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); }
+    @if $variant == 'light' { outline-color: transparentize($selected_fg_color, 0.7); }
 
-  &:backdrop {
-    color: $backdrop_selected_fg_color;
+    &:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); }
 
-    &:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
+    &:backdrop {
+      color: $backdrop_selected_fg_color;
+
+      &:disabled { color: mix($backdrop_selected_fg_color, $selected_bg_color, 30%); }
+    }
   }
 }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 9bb93a5..2c0a99b 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3799,6 +3799,12 @@ placessidebar row {
       padding-right: 8px; }
     placessidebar row image.sidebar-icon:dir(rtl) {
       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) {
     padding-right: 2px; }
   placessidebar row label.sidebar-label:dir(rtl) {
@@ -4189,44 +4195,57 @@ textview text:selected:focus,
 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, 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, 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 {
-  background-color: #215d9c;
-  color: #ffffff; }
-  iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected,
-  iconview text:disabled:selected:focus,
-  textview text:disabled:selected:focus,
-  .view 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 selection:disabled, flowbox flowboxchild:disabled:selected, row:selected label:disabled, 
label:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled,
-  entry selection:disabled, modelbutton.flat:disabled:selected, popover.background 
checkbutton:disabled:selected,
-  popover.background radiobutton:disabled:selected,
-  .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar 
:disabled:selected {
-    color: #90aece; }
-  iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected,
-  iconview text:backdrop:selected:focus,
-  textview text:backdrop:selected:focus,
-  .view 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 selection:backdrop, flowbox flowboxchild:backdrop:selected, row:selected label:backdrop, 
label:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop,
-  entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background 
checkbutton:backdrop:selected,
-  popover.background radiobutton:backdrop:selected,
-  .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar 
:backdrop:selected {
+  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; }
-    .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected,
-    .view 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 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,
-    entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background 
checkbutton: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 {
-      color: #648eba; }
+    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,
+    textview text:disabled:selected:focus,
+    .view 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 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,
+    popover.background radiobutton:disabled:selected,
+    .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar 
:disabled:selected {
+      color: #90aece; }
+    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,
+    textview text:backdrop:selected:focus,
+    .view 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 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,
+    popover.background radiobutton:backdrop:selected,
+    .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar 
:backdrop:selected {
+      color: #ffffff; }
+      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,
+      iconview text:backdrop:disabled:selected,
+      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, 
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,
+      popover.background radiobutton:backdrop:disabled:selected,
+      .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, 
calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected {
+        color: #648eba; }
 
 .monospace {
   font: Monospace; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 3586f0c..ac15a5d 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3827,6 +3827,12 @@ placessidebar row {
       padding-right: 8px; }
     placessidebar row image.sidebar-icon:dir(rtl) {
       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) {
     padding-right: 2px; }
   placessidebar row label.sidebar-label:dir(rtl) {
@@ -4217,45 +4223,58 @@ textview text:selected:focus,
 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, 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, 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 {
-  background-color: #4a90d9;
-  color: #ffffff;
-  outline-color: rgba(255, 255, 255, 0.3); }
-  iconview:disabled:selected:focus, .view:disabled:selected, iconview:disabled:selected,
-  iconview text:disabled:selected:focus,
-  textview text:disabled:selected:focus,
-  .view 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 selection:disabled, flowbox flowboxchild:disabled:selected, row:selected label:disabled, 
label:disabled:selected, label:disabled selection, spinbutton:not(.vertical) selection:disabled,
-  entry selection:disabled, modelbutton.flat:disabled:selected, popover.background 
checkbutton:disabled:selected,
-  popover.background radiobutton:disabled:selected,
-  .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar 
:disabled:selected {
-    color: #a5c8ec; }
-  iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected,
-  iconview text:backdrop:selected:focus,
-  textview text:backdrop:selected:focus,
-  .view 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 selection:backdrop, flowbox flowboxchild:backdrop:selected, row:selected label:backdrop, 
label:backdrop:selected, label:backdrop selection, spinbutton:not(.vertical) selection:backdrop,
-  entry selection:backdrop, modelbutton.flat:backdrop:selected, popover.background 
checkbutton:backdrop:selected,
-  popover.background radiobutton:backdrop:selected,
-  .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar 
:backdrop:selected {
-    color: #ffffff; }
-    .view:backdrop:disabled:selected, iconview:backdrop:disabled:selected,
-    .view 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 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,
-    entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background 
checkbutton: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 {
-      color: #80b1e4; }
+  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;
+    outline-color: rgba(255, 255, 255, 0.3); }
+    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,
+    textview text:disabled:selected:focus,
+    .view 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 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,
+    popover.background radiobutton:disabled:selected,
+    .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar 
:disabled:selected {
+      color: #a5c8ec; }
+    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,
+    textview text:backdrop:selected:focus,
+    .view 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 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,
+    popover.background radiobutton:backdrop:selected,
+    .menuitem.button.flat:backdrop:selected, row:backdrop:selected, calendar:backdrop:selected, .sidebar 
:backdrop:selected {
+      color: #ffffff; }
+      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,
+      iconview text:backdrop:disabled:selected,
+      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, 
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,
+      popover.background radiobutton:backdrop:disabled:selected,
+      .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, 
calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected {
+        color: #80b1e4; }
 
 .monospace {
   font: Monospace; }