AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 06:10:15 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Adwaita: desaturate selected color for backdrop"

Browse Source 
This reverts commit 6f478db2fa.

As per discussion on bug 746202, the real solution to the case
in bug 704352 is what the reporter suggests.
This commit is contained in:
Jakub Steiner 2015-03-30 14:54:25 +02:00
parent 95e2dc32ec
commit 40a83ef5a6
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtk/theme/Adwaita/_colors.scss
View File

@ -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%);

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

@ -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 */

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

@ -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,

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

@ -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,