callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adwaita: dark: Make colorswatch.light tick visible

Browse Source 
It used $text_color unconditionally, but in :dark, text is white, so we
overlaid a white tick on any light colours, all the way to white itself.

Using these named colours doesn’t make practical or semantic sense.
Instead, use white/black over dark/light swatches, as in HC, so all
variant–swatch combos work. Light looks the same, & :dark works now.

For backdrop, use alpha 0.5, unlike 0.7 in HC, as that seemed excessive
& different from the current effect. 0.5 is almost identical to how
$backdrop_fg_colour is a 50% mix of $fg_color, & matches backdrop text.

https://bugzilla.gnome.org/show_bug.cgi?id=787531
This commit is contained in:
Daniel Boles 2017-09-16 15:46:50 +01:00
parent 009e388bb7
commit 437ce0197b
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4117,19 +4117,19 @@ colorswatch {
}
&.dark overlay {
color: $selected_fg_color;
color: white;
&:hover { border-color: if($variant == 'light', transparentize(black, 0.2), $borders_color); }
&:backdrop { color: $backdrop_selected_fg_color; }
&:backdrop { color: transparentize(white, 0.5); }
}
&.light overlay {
color: $text_color;
color: black;
&:hover { border-color: if($variant == 'light', transparentize(black, 0.5), $borders_color); }
&:backdrop { color: $backdrop_text_color; }
&:backdrop { color: transparentize(black, 0.5); }
}
&:drop(active) {

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

@ -1764,17 +1764,17 @@ colorswatch.right, colorswatch:last-child:not(.bottom) { border-top-right-radius
colorswatch.right overlay, colorswatch:last-child:not(.bottom) overlay { border-top-right-radius: 5px; border-bottom-right-radius: 5px; }
colorswatch.dark overlay { color: #ffffff; }
colorswatch.dark overlay { color: white; }
colorswatch.dark overlay:hover { border-color: #1b1f20; }
colorswatch.dark overlay:backdrop { color: #d3d4d5; }
colorswatch.dark overlay:backdrop { color: rgba(255, 255, 255, 0.5); }
colorswatch.light overlay { color: white; }
colorswatch.light overlay { color: black; }
colorswatch.light overlay:hover { border-color: #1b1f20; }
colorswatch.light overlay:backdrop { color: #d3d4d5; }
colorswatch.light overlay:backdrop { color: rgba(0, 0, 0, 0.5); }
colorswatch:drop(active) { box-shadow: none; }

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

@ -1784,17 +1784,17 @@ colorswatch.right, colorswatch:last-child:not(.bottom) { border-top-right-radius
colorswatch.right overlay, colorswatch:last-child:not(.bottom) overlay { border-top-right-radius: 5px; border-bottom-right-radius: 5px; }
colorswatch.dark overlay { color: #ffffff; }
colorswatch.dark overlay { color: white; }
colorswatch.dark overlay:hover { border-color: rgba(0, 0, 0, 0.8); }
colorswatch.dark overlay:backdrop { color: #fcfcfc; }
colorswatch.dark overlay:backdrop { color: rgba(255, 255, 255, 0.5); }
colorswatch.light overlay { color: black; }
colorswatch.light overlay:hover { border-color: rgba(0, 0, 0, 0.5); }
colorswatch.light overlay:backdrop { color: #323232; }
colorswatch.light overlay:backdrop { color: rgba(0, 0, 0, 0.5); }
colorswatch:drop(active) { box-shadow: none; }