[gtk+] Revert "Adwaita: desaturate selected color for backdrop"
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Revert "Adwaita: desaturate selected color for backdrop"
- Date: Mon, 30 Mar 2015 12:55:27 +0000 (UTC)
commit 40a83ef5a67cdac1ba7e1153736d4d028baaf2b3
Author: Jakub Steiner <jimmac gmail com>
Date: Mon Mar 30 14:54:25 2015 +0200
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.
gtk/theme/Adwaita/_colors.scss | 1 -
gtk/theme/Adwaita/_common.scss | 5 +----
gtk/theme/Adwaita/gtk-contained-dark.css | 3 +--
gtk/theme/Adwaita/gtk-contained.css | 3 +--
4 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Adwaita/_colors.scss
index 4b6fc9c..4590c1e 100644
--- 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 3c94d30..f80ab88 100644
--- 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 d4e0193..b3c69fd 100644
--- 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 4b5cfd7..6085e6c 100644
--- 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,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]