Revert "Adwaita: desaturate selected color for backdrop"

This reverts commit 6f478db2facd8744714b7ab374d2687d777653a3.

As per discussion on bug 746202, the real solution to the case
in bug 704352 is what the reporter suggests.

diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Adwaita/_colors.scss
index 4b6fc9c2e196fa11e3ccb082120eb12c66d0089a..4590c1e2645e8c13a4f32e6d8256c4d833299ff4 100644 (file)
--- a/gtk/theme/Adwaita/_colors.scss
+++ b/gtk/theme/Adwaita/_colors.scss
@@ -46,7 +46,6 @@ $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_selected_bg_color: desaturate($selected_bg_color,100%);
 $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/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 3c94d304425e148e53d65e9ca7fcfe6cf0336b95..f80ab88f8b8ac674d72206af82e104a2f08dbca5 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3261,10 +3261,7 @@ GtkVolumeButton.button { padding: 8px; }
   @if $variant == 'light' {
     outline-color: transparentize($selected_fg_color, 0.7);
   }
-  &:backdrop {
-    color: $backdrop_selected_fg_color;
-    background-color: $backdrop_selected_bg_color;
-  }
+  &:backdrop { color: $backdrop_selected_fg_color; }
 }
 
 /* Decouple the font of context menus from their entry/textview */

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index d4e0193639325ccc66be6f6253dde3694d6be2fb..b3c69fdd3e664014900a6a1fd0dd30e3db41f3db 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4274,8 +4274,7 @@ GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
   color: #ffffff; }
   .view:backdrop:selected, GtkCalendar: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, .sidebar:backdrop:selected, GtkPlacesSidebar.sidebar .view:backdrop:selected, GtkPlacesSidebar.sidebar GtkCalendar:backdrop:selected {
-    color: #ffffff;
-    background-color: #5e5e5e; }
+    color: #ffffff; }
 
 /* Decouple the font of context menus from their entry/textview */
 .touch-selection,

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 4b5cfd7ee949a5366851196fff876e06d2e9dd1c..6085e6c7108dd40db7ef177f774288d466500900 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4447,8 +4447,7 @@ GtkVolumeButton.button, .header-bar GtkVolumeButton.button.titlebutton,
   outline-color: rgba(255, 255, 255, 0.3); }
   .view:backdrop:selected, GtkCalendar: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, .sidebar:backdrop:selected, GtkPlacesSidebar.sidebar .view:backdrop:selected, GtkPlacesSidebar.sidebar GtkCalendar:backdrop:selected {
-    color: #ffffff;
-    background-color: #929292; }
+    color: #ffffff; }
 
 /* Decouple the font of context menus from their entry/textview */
 .touch-selection,