Adwaita: :selected cleanup and rationalization

4 files changed, 66 insertions, 167 deletions

diff --git a/gtk/resources/theme/Adwaita/_colors.scss b/gtk/resources/theme/Adwaita/_colors.scss
index acb503835d..4590c1e264 100644
--- a/gtk/resources/theme/Adwaita/_colors.scss
+++ b/gtk/resources/theme/Adwaita/_colors.scss
@@ -45,6 +45,7 @@ $backdrop_text_color: mix($text_color, $backdrop_base_color, 80%);
 $backdrop_bg_color: $bg_color;
 $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 50%);
 $backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%));
+$backdrop_selected_fg_color: $selected_fg_color;
 $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
 $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%);
 $backdrop_sidebar_bg_color: lighten($backdrop_bg_color,5%);
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index ee5a2ad1b9..921e6d49c3 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -110,6 +110,7 @@ $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
   &:selected,
   &:selected:focus,
   &:selected:hover {
+    border-radius: 3px;
     @extend %selected_items;
   }
 }
@@ -258,10 +259,6 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
   &:insensitive { @include entry(insensitive); }
   &:backdrop { @include entry(backdrop); }
   &:backdrop:insensitive { @include entry(backdrop-insensitive); }
-  &:selected, &:backdrop:selected {
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-  }
 
   &:selected,
   &:selected:focus {
@@ -295,30 +292,22 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
     }
   }
 
-  &.error {
+  &.error { // FIXME: dark variant love needed
     color: $error_color;
     border-color: $error_color;
     &:focus { @include entry(focus, $error_color); }
     &:selected, &:selected:focus {
       background-color: $error_color;
     }
-    @if $variant == 'dark' {
-      &:selected:focus { color: $base_color; }
-      &:selected:backdrop { color: $backdrop_base_color; }
-    }
   }
 
-  &.warning {
+  &.warning { // FIXME: dark variant love needed
     color: $warning_color;
     border-color: $warning_color;
     &:focus { @include entry(focus, $warning_color); }
     &:selected, &:selected:focus {
       background-color: $warning_color;
     }
-    @if $variant == 'dark' {
-      &:selected:focus { color: $base_color; }
-      &:selected:backdrop { color: $backdrop_base_color; }
-    }
   }
 
   &.image { // entry icons colors
@@ -1379,7 +1368,7 @@ GtkTreeView.view {
     &:selected {
       color: mix($selected_fg_color, $selected_bg_color, 70%);
       &:hover { color: $selected_fg_color; }
-      &:backdrop { color: mix($backdrop_base_color, $selected_bg_color, 70%); }
+      &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, 70%); }
     }
     &:checked {
       -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
@@ -2723,11 +2712,7 @@ GtkCalendar {
   border: 1px solid $borders_color;
 
   &:selected {
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-    border-radius: 3px;
-
-    &:backdrop { color: if($variant=='light', $backdrop_base_color, $backdrop_fg_color); }
+    @extend .view:selected;
   }
 
   &.header {
@@ -2873,36 +2858,19 @@ GtkFileChooserDialog {
 .sidebar {
   border: none;
   background-color: $sidebar_bg_color;
-/*
-  .scrollbar {
-    &.trough {
-      background-color: darken($bg_color,10%);
-      border-radius: 6px;
-      border-width: 2px;
-      border-color: transparent;
-    }
 
-    &.slider {
-      background-color: $sidebar_bg_color;
-      &:hover { background-color: lighten($bg_color, 10%); }
-    }
-  }
-*/
   &:backdrop {
     background-color: $backdrop_sidebar_bg_color;
   }
 
   &:selected {
-    background-color: $selected_bg_color;
+    @extend %selected_items;
   }
 }
 
 // Places sidebar is a special case, since the view here have to look like chrome not content, so we override text color
 GtkPlacesSidebar.sidebar .view {
 
-  $_backdrop_selected_fg_color: if($variant == 'light', $backdrop_base_color, $selected_bg_color); // FIXME this should be a general
-                                                                                                   // color var
-
   color: $fg_color;
   background-color: transparent;
 
@@ -2915,7 +2883,7 @@ GtkPlacesSidebar.sidebar .view {
     &:selected {
       color: mix($selected_fg_color, $selected_bg_color, 90%);
 
-      &:backdrop { color: mix($_backdrop_selected_fg_color, $selected_bg_color, 90%); }
+      &:backdrop { color: mix($backdrop_selected_fg_color, $selected_bg_color, 90%); }
     }
 
     &:backdrop { color: mix($backdrop_fg_color, $sidebar_bg_color, 70%); }
@@ -2924,10 +2892,7 @@ GtkPlacesSidebar.sidebar .view {
   &:backdrop { color: $backdrop_fg_color; }
 
   &:selected {
-    color: $selected_fg_color;
-    background-color: $selected_bg_color;
-
-    &:backdrop { color: $_backdrop_selected_fg_color; }
+    @extend %selected_items;
   }
 }
 
@@ -3243,8 +3208,7 @@ GtkVolumeButton.button { padding: 8px; }
   @if $variant == 'light' {
     outline-color: transparentize($selected_fg_color, 0.7);
   }
-  &:backdrop { color: if($variant=='light', $backdrop_base_color,
-                                            $backdrop_fg_color); }
+  &:backdrop { color: $backdrop_selected_fg_color; }
 }
 
 /* Decouple the font of context menus from their entry/textview */
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 63bc73d3d0..97da0db318 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -68,6 +68,8 @@
   .view:backdrop {
     color: #d4d4d4;
     background-color: #2c2c2c; }
+  .view:selected, GtkCalendar:selected, .view:selected:focus, GtkCalendar:focus:selected, .view:selected:hover, GtkCalendar:hover:selected {
+    border-radius: 3px; }
 
 .rubberband {
   border: 1px solid #215d9c;
@@ -262,9 +264,6 @@ GtkTextView {
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #323636);
     box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 238, 236, 0); }
-  .entry:selected, .entry:backdrop:selected {
-    background-color: #215d9c;
-    color: #ffffff; }
   .entry.progressbar {
     margin: 1px;
     border-radius: 0;
@@ -299,10 +298,6 @@ GtkTextView {
       border-color: #1a0000; }
     .entry.error:selected, .entry.error:selected:focus {
       background-color: #cc0000; }
-    .entry.error:selected:focus {
-      color: #292929; }
-    .entry.error:selected:backdrop {
-      color: #2c2c2c; }
   .entry.warning {
     color: #f57900;
     border-color: #f57900; }
@@ -313,10 +308,6 @@ GtkTextView {
       border-color: #432100; }
     .entry.warning:selected, .entry.warning:selected:focus {
       background-color: #f57900; }
-    .entry.warning:selected:focus {
-      color: #292929; }
-    .entry.warning:selected:backdrop {
-      color: #2c2c2c; }
   .entry.image {
     color: #c6c6c5; }
     .entry.image:hover {
@@ -1990,7 +1981,7 @@ GtkTreeView.view {
       GtkTreeView.view.expander:selected:hover {
         color: #ffffff; }
       GtkTreeView.view.expander:selected:backdrop {
-        color: #283a4d; }
+        color: #bccee1; }
     GtkTreeView.view.expander:checked {
       -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
     GtkTreeView.view.expander:backdrop {
@@ -2905,7 +2896,7 @@ GtkSwitch {
 .view.check, .view.radio,
 .list-row .check, list-row .radio {
   icon-shadow: none; }
-  .view.check:selected, .view.check:hover, .view.radio:selected, .view.radio:hover,
+  .view.check:selected, GtkCalendar.check:selected, .view.check:hover, .view.radio:selected, GtkCalendar.radio:selected, .view.radio:hover,
   .list-row .check:selected,
   .list-row .check:hover, list-row .radio:selected, list-row .radio:hover {
     icon-shadow: none; }
@@ -3781,12 +3772,6 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop {
 GtkCalendar {
   color: white;
   border: 1px solid #1c1f1f; }
-  GtkCalendar:selected {
-    background-color: #215d9c;
-    color: #ffffff;
-    border-radius: 3px; }
-    GtkCalendar:selected:backdrop {
-      color: #939695; }
   GtkCalendar.header {
     border: 1px solid rgba(0, 0, 0, 0.1);
     border-radius: 0; }
@@ -3997,26 +3982,9 @@ GtkFileChooserDialog .dialog-action-box {
  ***********/
 .sidebar {
   border: none;
-  background-color: #454c4c;
-  /*
-    .scrollbar {
-      &.trough {
-        background-color: darken($bg_color,10%);
-        border-radius: 6px;
-        border-width: 2px;
-        border-color: transparent;
-      }
-  
-      &.slider {
-        background-color: $sidebar_bg_color;
-        &:hover { background-color: lighten($bg_color, 10%); }
-      }
-    }
-  */ }
+  background-color: #454c4c; }
   .sidebar:backdrop {
     background-color: #454c4c; }
-  .sidebar:selected {
-    background-color: #215d9c; }
 
 GtkPlacesSidebar.sidebar .view {
   color: #eeeeec;
@@ -4026,16 +3994,11 @@ GtkPlacesSidebar.sidebar .view {
     GtkPlacesSidebar.sidebar .view .image:selected {
       color: #e8eef5; }
       GtkPlacesSidebar.sidebar .view .image:selected:backdrop {
-        color: #215d9c; }
+        color: #e8eef5; }
     GtkPlacesSidebar.sidebar .view .image:backdrop {
       color: #7b7f7f; }
   GtkPlacesSidebar.sidebar .view:backdrop {
     color: #939695; }
-  GtkPlacesSidebar.sidebar .view:selected {
-    color: #ffffff;
-    background-color: #215d9c; }
-    GtkPlacesSidebar.sidebar .view:selected:backdrop {
-      color: #215d9c; }
 
 .sidebar-item {
   padding: 10px 4px; }
@@ -4340,13 +4303,13 @@ GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
   .titlebar.selection-mode .titlebutton.button:backdrop {
     icon-shadow: none; }
 
-.view:selected, .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.titlebutton.button:selected,
-.titlebar .menuitem.titlebutton.button:selected, .list-row:selected {
+.view:selected, GtkCalendar:selected, .view:selected:focus, GtkCalendar:focus:selected, .view:selected:hover, GtkCalendar:hover:selected, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.titlebutton.button:selected,
+.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected, GtkPlacesSidebar.sidebar .view:selected, GtkPlacesSidebar.sidebar GtkCalendar:selected {
   background-color: #215d9c;
   color: #ffffff; }
-  .view:backdrop:selected, .label:backdrop:selected, .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
-  .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected {
-    color: #939695; }
+  .view:backdrop:selected, GtkCalendar:backdrop:selected, GtkCalendar:backdrop:focus:selected, GtkCalendar:backdrop:hover:selected, .label:backdrop:selected, .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
+  .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected, GtkPlacesSidebar.sidebar .view:backdrop:selected, GtkPlacesSidebar.sidebar GtkCalendar:backdrop:selected {
+    color: #ffffff; }
 
 /* Decouple the font of context menus from their entry/textview */
 .touch-selection,
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 19170b382f..8b757e06a9 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -68,6 +68,8 @@
   .view:backdrop {
     color: #323232;
     background-color: white; }
+  .view:selected, GtkCalendar:selected, .view:selected:focus, GtkCalendar:focus:selected, .view:selected:hover, GtkCalendar:hover:selected {
+    border-radius: 3px; }
 
 .rubberband {
   border: 1px solid #4a90d9;
@@ -262,9 +264,6 @@ GtkTextView {
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #f4f4f4);
     box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 255, 255, 0); }
-  .entry:selected, .entry:backdrop:selected {
-    background-color: #4a90d9;
-    color: #ffffff; }
   .entry.progressbar {
     margin: 1px;
     border-radius: 0;
@@ -2640,7 +2639,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button {
     icon-shadow: none; }
 
-.view.check:selected,
+.view.check:selected, GtkCalendar.check:selected,
 .list-row:selected .check {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked.png"), url("assets/selected-checkbox-unchecked@2.png")); }
 
@@ -2651,7 +2650,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:hover {
     icon-shadow: none; }
 
-.view.check:hover:selected,
+.view.check:hover:selected, GtkCalendar.check:hover:selected,
 .list-row:selected .check:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-hover.png"), url("assets/selected-checkbox-unchecked-hover@2.png")); }
 
@@ -2662,7 +2661,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:active {
     icon-shadow: none; }
 
-.view.check:active:selected,
+.view.check:active:selected, GtkCalendar.check:active:selected,
 .list-row:selected .check:active {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-active.png"), url("assets/selected-checkbox-unchecked-active@2.png")); }
 
@@ -2673,7 +2672,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:insensitive {
     icon-shadow: none; }
 
-.view.check:insensitive:selected,
+.view.check:insensitive:selected, GtkCalendar.check:insensitive:selected,
 .list-row:selected .check:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-insensitive.png"), url("assets/selected-checkbox-unchecked-insensitive@2.png")); }
 
@@ -2684,7 +2683,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:backdrop {
     icon-shadow: none; }
 
-.view.check:backdrop:selected,
+.view.check:backdrop:selected, GtkCalendar.check:backdrop:selected,
 .list-row:selected .check:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-backdrop.png"), url("assets/selected-checkbox-unchecked-backdrop@2.png")); }
 
@@ -2695,7 +2694,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:backdrop:insensitive {
     icon-shadow: none; }
 
-.view.check:backdrop:insensitive:selected,
+.view.check:backdrop:insensitive:selected, GtkCalendar.check:backdrop:insensitive:selected,
 .list-row:selected .check:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-unchecked-backdrop-insensitive.png"), url("assets/selected-checkbox-unchecked-backdrop-insensitive@2.png")); }
 
@@ -2706,7 +2705,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:inconsistent {
     icon-shadow: none; }
 
-.view.check:inconsistent:selected,
+.view.check:inconsistent:selected, GtkCalendar.check:inconsistent:selected,
 .list-row:selected .check:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed.png"), url("assets/selected-checkbox-mixed@2.png")); }
 
@@ -2717,7 +2716,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:inconsistent:hover {
     icon-shadow: none; }
 
-.view.check:inconsistent:hover:selected,
+.view.check:inconsistent:hover:selected, GtkCalendar.check:inconsistent:hover:selected,
 .list-row:selected .check:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-hover.png"), url("assets/selected-checkbox-mixed-hover@2.png")); }
 
@@ -2728,7 +2727,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:inconsistent:selected {
     icon-shadow: none; }
 
-.view.check:inconsistent:selected:selected,
+.view.check:inconsistent:selected:selected, GtkCalendar.check:inconsistent:selected,
 .list-row:selected .check:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-active.png"), url("assets/selected-checkbox-mixed-active@2.png")); }
 
@@ -2739,7 +2738,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:inconsistent:backdrop {
     icon-shadow: none; }
 
-.view.check:inconsistent:backdrop:selected,
+.view.check:inconsistent:backdrop:selected, GtkCalendar.check:inconsistent:backdrop:selected,
 .list-row:selected .check:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-backdrop.png"), url("assets/selected-checkbox-mixed-backdrop@2.png")); }
 
@@ -2750,7 +2749,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:inconsistent:insensitive {
     icon-shadow: none; }
 
-.view.check:inconsistent:insensitive:selected,
+.view.check:inconsistent:insensitive:selected, GtkCalendar.check:inconsistent:insensitive:selected,
 .list-row:selected .check:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-insensitive.png"), url("assets/selected-checkbox-mixed-insensitive@2.png")); }
 
@@ -2761,7 +2760,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:inconsistent:insensitive:backdrop {
     icon-shadow: none; }
 
-.view.check:inconsistent:insensitive:backdrop:selected,
+.view.check:inconsistent:insensitive:backdrop:selected, GtkCalendar.check:inconsistent:insensitive:backdrop:selected,
 .list-row:selected .check:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-mixed-backdrop-insensitive.png"), url("assets/selected-checkbox-mixed-backdrop-insensitive@2.png")); }
 
@@ -2772,7 +2771,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:checked {
     icon-shadow: none; }
 
-.view.check:checked:selected,
+.view.check:checked:selected, GtkCalendar.check:checked:selected,
 .list-row:selected .check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked.png"), url("assets/selected-checkbox-checked@2.png")); }
 
@@ -2783,7 +2782,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:checked:insensitive {
     icon-shadow: none; }
 
-.view.check:checked:insensitive:selected,
+.view.check:checked:insensitive:selected, GtkCalendar.check:checked:insensitive:selected,
 .list-row:selected .check:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-insensitive.png"), url("assets/selected-checkbox-checked-insensitive@2.png")); }
 
@@ -2794,7 +2793,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:checked:hover {
     icon-shadow: none; }
 
-.view.check:checked:hover:selected,
+.view.check:checked:hover:selected, GtkCalendar.check:checked:hover:selected,
 .list-row:selected .check:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-hover.png"), url("assets/selected-checkbox-checked-hover@2.png")); }
 
@@ -2805,7 +2804,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:checked:active {
     icon-shadow: none; }
 
-.view.check:checked:active:selected,
+.view.check:checked:active:selected, GtkCalendar.check:checked:active:selected,
 .list-row:selected .check:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-active.png"), url("assets/selected-checkbox-checked-active@2.png")); }
 
@@ -2816,7 +2815,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:backdrop:checked {
     icon-shadow: none; }
 
-.view.check:backdrop:checked:selected,
+.view.check:backdrop:checked:selected, GtkCalendar.check:backdrop:checked:selected,
 .list-row:selected .check:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-backdrop.png"), url("assets/selected-checkbox-checked-backdrop@2.png")); }
 
@@ -2827,7 +2826,7 @@ GtkSwitch {
   .titlebar .check.titlebutton.button:backdrop:checked:insensitive {
     icon-shadow: none; }
 
-.view.check:backdrop:checked:insensitive:selected,
+.view.check:backdrop:checked:insensitive:selected, GtkCalendar.check:backdrop:checked:insensitive:selected,
 .list-row:selected .check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-backdrop-insensitive.png"), url("assets/selected-checkbox-checked-backdrop-insensitive@2.png")); }
 
@@ -2851,7 +2850,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button {
     icon-shadow: none; }
 
-.view.radio:selected,
+.view.radio:selected, GtkCalendar.radio:selected,
 .list-row:selected .radio {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked.png"), url("assets/selected-radio-unchecked@2.png")); }
 
@@ -2862,7 +2861,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:hover {
     icon-shadow: none; }
 
-.view.radio:hover:selected,
+.view.radio:hover:selected, GtkCalendar.radio:hover:selected,
 .list-row:selected .radio:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-hover.png"), url("assets/selected-radio-unchecked-hover@2.png")); }
 
@@ -2873,7 +2872,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:active {
     icon-shadow: none; }
 
-.view.radio:active:selected,
+.view.radio:active:selected, GtkCalendar.radio:active:selected,
 .list-row:selected .radio:active {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-active.png"), url("assets/selected-radio-unchecked-active@2.png")); }
 
@@ -2884,7 +2883,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:insensitive {
     icon-shadow: none; }
 
-.view.radio:insensitive:selected,
+.view.radio:insensitive:selected, GtkCalendar.radio:insensitive:selected,
 .list-row:selected .radio:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-insensitive.png"), url("assets/selected-radio-unchecked-insensitive@2.png")); }
 
@@ -2895,7 +2894,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:backdrop {
     icon-shadow: none; }
 
-.view.radio:backdrop:selected,
+.view.radio:backdrop:selected, GtkCalendar.radio:backdrop:selected,
 .list-row:selected .radio:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-backdrop.png"), url("assets/selected-radio-unchecked-backdrop@2.png")); }
 
@@ -2906,7 +2905,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:backdrop:insensitive {
     icon-shadow: none; }
 
-.view.radio:backdrop:insensitive:selected,
+.view.radio:backdrop:insensitive:selected, GtkCalendar.radio:backdrop:insensitive:selected,
 .list-row:selected .radio:backdrop:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-unchecked-backdrop-insensitive.png"), url("assets/selected-radio-unchecked-backdrop-insensitive@2.png")); }
 
@@ -2917,7 +2916,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:inconsistent {
     icon-shadow: none; }
 
-.view.radio:inconsistent:selected,
+.view.radio:inconsistent:selected, GtkCalendar.radio:inconsistent:selected,
 .list-row:selected .radio:inconsistent {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed.png"), url("assets/selected-radio-mixed@2.png")); }
 
@@ -2928,7 +2927,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:inconsistent:hover {
     icon-shadow: none; }
 
-.view.radio:inconsistent:hover:selected,
+.view.radio:inconsistent:hover:selected, GtkCalendar.radio:inconsistent:hover:selected,
 .list-row:selected .radio:inconsistent:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-hover.png"), url("assets/selected-radio-mixed-hover@2.png")); }
 
@@ -2939,7 +2938,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:inconsistent:selected {
     icon-shadow: none; }
 
-.view.radio:inconsistent:selected:selected,
+.view.radio:inconsistent:selected:selected, GtkCalendar.radio:inconsistent:selected,
 .list-row:selected .radio:inconsistent:selected {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-active.png"), url("assets/selected-radio-mixed-active@2.png")); }
 
@@ -2950,7 +2949,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:inconsistent:backdrop {
     icon-shadow: none; }
 
-.view.radio:inconsistent:backdrop:selected,
+.view.radio:inconsistent:backdrop:selected, GtkCalendar.radio:inconsistent:backdrop:selected,
 .list-row:selected .radio:inconsistent:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-backdrop.png"), url("assets/selected-radio-mixed-backdrop@2.png")); }
 
@@ -2961,7 +2960,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:inconsistent:insensitive {
     icon-shadow: none; }
 
-.view.radio:inconsistent:insensitive:selected,
+.view.radio:inconsistent:insensitive:selected, GtkCalendar.radio:inconsistent:insensitive:selected,
 .list-row:selected .radio:inconsistent:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-insensitive.png"), url("assets/selected-radio-mixed-insensitive@2.png")); }
 
@@ -2972,7 +2971,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:inconsistent:insensitive:backdrop {
     icon-shadow: none; }
 
-.view.radio:inconsistent:insensitive:backdrop:selected,
+.view.radio:inconsistent:insensitive:backdrop:selected, GtkCalendar.radio:inconsistent:insensitive:backdrop:selected,
 .list-row:selected .radio:inconsistent:insensitive:backdrop {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-mixed-backdrop-insensitive.png"), url("assets/selected-radio-mixed-backdrop-insensitive@2.png")); }
 
@@ -2983,7 +2982,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:checked {
     icon-shadow: none; }
 
-.view.radio:checked:selected,
+.view.radio:checked:selected, GtkCalendar.radio:checked:selected,
 .list-row:selected .radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked.png"), url("assets/selected-radio-checked@2.png")); }
 
@@ -2994,7 +2993,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:checked:insensitive {
     icon-shadow: none; }
 
-.view.radio:checked:insensitive:selected,
+.view.radio:checked:insensitive:selected, GtkCalendar.radio:checked:insensitive:selected,
 .list-row:selected .radio:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-insensitive.png"), url("assets/selected-radio-checked-insensitive@2.png")); }
 
@@ -3005,7 +3004,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:checked:hover {
     icon-shadow: none; }
 
-.view.radio:checked:hover:selected,
+.view.radio:checked:hover:selected, GtkCalendar.radio:checked:hover:selected,
 .list-row:selected .radio:checked:hover {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-hover.png"), url("assets/selected-radio-checked-hover@2.png")); }
 
@@ -3016,7 +3015,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:checked:active {
     icon-shadow: none; }
 
-.view.radio:checked:active:selected,
+.view.radio:checked:active:selected, GtkCalendar.radio:checked:active:selected,
 .list-row:selected .radio:checked:active {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-active.png"), url("assets/selected-radio-checked-active@2.png")); }
 
@@ -3027,7 +3026,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:backdrop:checked {
     icon-shadow: none; }
 
-.view.radio:backdrop:checked:selected,
+.view.radio:backdrop:checked:selected, GtkCalendar.radio:backdrop:checked:selected,
 .list-row:selected .radio:backdrop:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-backdrop.png"), url("assets/selected-radio-checked-backdrop@2.png")); }
 
@@ -3038,7 +3037,7 @@ GtkSwitch {
   .titlebar .radio.titlebutton.button:backdrop:checked:insensitive {
     icon-shadow: none; }
 
-.view.radio:backdrop:checked:insensitive:selected,
+.view.radio:backdrop:checked:insensitive:selected, GtkCalendar.radio:backdrop:checked:insensitive:selected,
 .list-row:selected .radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-backdrop-insensitive.png"), url("assets/selected-radio-checked-backdrop-insensitive@2.png")); }
 
@@ -3058,7 +3057,7 @@ GtkSwitch {
 .view.check, .view.radio,
 .list-row .check, list-row .radio {
   icon-shadow: none; }
-  .view.check:selected, .view.check:hover, .view.radio:selected, .view.radio:hover,
+  .view.check:selected, GtkCalendar.check:selected, .view.check:hover, .view.radio:selected, GtkCalendar.radio:selected, .view.radio:hover,
   .list-row .check:selected,
   .list-row .check:hover, list-row .radio:selected, list-row .radio:hover {
     icon-shadow: none; }
@@ -3942,12 +3941,6 @@ GtkPlacesSidebar.sidebar .view .separator:backdrop {
 GtkCalendar {
   color: black;
   border: 1px solid #a1a1a1; }
-  GtkCalendar:selected {
-    background-color: #4a90d9;
-    color: #ffffff;
-    border-radius: 3px; }
-    GtkCalendar:selected:backdrop {
-      color: white; }
   GtkCalendar.header {
     border: 1px solid rgba(0, 0, 0, 0.1);
     border-radius: 0; }
@@ -4158,26 +4151,9 @@ GtkFileChooserDialog .dialog-action-box {
  ***********/
 .sidebar {
   border: none;
-  background-color: #fafafa;
-  /*
-    .scrollbar {
-      &.trough {
-        background-color: darken($bg_color,10%);
-        border-radius: 6px;
-        border-width: 2px;
-        border-color: transparent;
-      }
-  
-      &.slider {
-        background-color: $sidebar_bg_color;
-        &:hover { background-color: lighten($bg_color, 10%); }
-      }
-    }
-  */ }
+  background-color: #fafafa; }
   .sidebar:backdrop {
     background-color: #fafafa; }
-  .sidebar:selected {
-    background-color: #4a90d9; }
 
 GtkPlacesSidebar.sidebar .view {
   color: #2e3436;
@@ -4192,11 +4168,6 @@ GtkPlacesSidebar.sidebar .view {
       color: #adafb0; }
   GtkPlacesSidebar.sidebar .view:backdrop {
     color: #8d9091; }
-  GtkPlacesSidebar.sidebar .view:selected {
-    color: #ffffff;
-    background-color: #4a90d9; }
-    GtkPlacesSidebar.sidebar .view:selected:backdrop {
-      color: white; }
 
 .sidebar-item {
   padding: 10px 4px; }
@@ -4501,14 +4472,14 @@ GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
   .titlebar.selection-mode .titlebutton.button:backdrop {
     icon-shadow: none; }
 
-.view:selected, .view:selected:focus, .view:selected:hover, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.titlebutton.button:selected,
-.titlebar .menuitem.titlebutton.button:selected, .list-row:selected {
+.view:selected, GtkCalendar:selected, .view:selected:focus, GtkCalendar:focus:selected, .view:selected:hover, GtkCalendar:hover:selected, .label:selected, .label:selected:focus, .label:selected:hover, .grid-child:selected, .entry:selected, .entry:selected:focus, .menuitem.button.flat:selected, .header-bar .menuitem.titlebutton.button:selected,
+.titlebar .menuitem.titlebutton.button:selected, .list-row:selected, .sidebar:selected, GtkPlacesSidebar.sidebar .view:selected, GtkPlacesSidebar.sidebar GtkCalendar:selected {
   background-color: #4a90d9;
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3); }
-  .view:backdrop:selected, .label:backdrop:selected, .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
-  .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected {
-    color: white; }
+  .view:backdrop:selected, GtkCalendar:backdrop:selected, GtkCalendar:backdrop:focus:selected, GtkCalendar:backdrop:hover:selected, .label:backdrop:selected, .grid-child:backdrop:selected, .entry:backdrop:selected, .menuitem.button.flat:backdrop:selected, .header-bar .menuitem.titlebutton.button:backdrop:selected,
+  .titlebar .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected, .sidebar:backdrop:selected, GtkPlacesSidebar.sidebar .view:backdrop:selected, GtkPlacesSidebar.sidebar GtkCalendar:backdrop:selected {
+    color: #ffffff; }
 
 /* Decouple the font of context menus from their entry/textview */
 .touch-selection,