AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Adwaita: flatten colorswatches

Browse Source
This commit is contained in:
Lapo Calamandrei 2016-04-17 18:17:07 +02:00
parent d77dc25b8d
commit a89d03d6b8
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3939,11 +3939,9 @@ colorswatch {
// is colorswatch overlay {}, colorswatch has the programmatically set background, so most of the style is // is colorswatch overlay {}, colorswatch has the programmatically set background, so most of the style is
// applied to the overlay box. // applied to the overlay box.
&, &:drop(active) { border-style: none; } // FIXME: implement a proper drop(active) state &:drop(active), & { border-style: none; } // FIXME: implement a proper drop(active) state
$_colorswatch_radius: 5px; $_colorswatch_radius: 5px;
$_colorswatch_overlay_shadow: if($variant == 'light', inset 0 2px 2px -3px transparentize(black, 0.3),
inset 0 3px 2px -2px transparentize(black, 0.5));
// base color corners rounding // base color corners rounding
// to avoid the artifacts caused by rounded corner anti-aliasing the base color // to avoid the artifacts caused by rounded corner anti-aliasing the base color
@ -4025,10 +4023,12 @@ colorswatch {
} }
overlay { overlay {
box-shadow: $_colorswatch_overlay_shadow;
border: 1px solid if($variant == 'light', transparentize(black, 0.7), $borders_color); border: 1px solid if($variant == 'light', transparentize(black, 0.7), $borders_color);
&:hover { box-shadow: inset 0 1px transparentize(white, 0.7); } &:hover {
box-shadow: inset 0 1px transparentize(white, 0.6),
inset 0 -1px transparentize(black, 0.8);
}
&:backdrop, &:backdrop:hover { &:backdrop, &:backdrop:hover {
border-color: if($variant == 'light', transparentize(black, 0.7), $borders_color); border-color: if($variant == 'light', transparentize(black, 0.7), $borders_color);

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

@ -4257,7 +4257,7 @@ tooltip {
/***************** /*****************
* Color Chooser * * Color Chooser *
*****************/ *****************/
colorswatch, colorswatch:drop(active) { colorswatch:drop(active), colorswatch {
border-style: none; } border-style: none; }
colorswatch.top { colorswatch.top {
border-top-left-radius: 5.5px; border-top-left-radius: 5.5px;
@ -4304,10 +4304,9 @@ colorswatch:drop(active) {
border-color: #4e9a06; border-color: #4e9a06;
box-shadow: inset 0 0 0 2px #212424, inset 0 0 0 1px #4e9a06; } box-shadow: inset 0 0 0 2px #212424, inset 0 0 0 1px #4e9a06; }
colorswatch overlay { colorswatch overlay {
box-shadow: inset 0 3px 2px -2px rgba(0, 0, 0, 0.5);
border: 1px solid #212424; } border: 1px solid #212424; }
colorswatch overlay:hover { colorswatch overlay:hover {
box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); } box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), inset 0 -1px rgba(0, 0, 0, 0.2); }
colorswatch overlay:backdrop, colorswatch overlay:backdrop:hover { colorswatch overlay:backdrop, colorswatch overlay:backdrop:hover {
border-color: #212424; border-color: #212424;
box-shadow: none; } box-shadow: none; }

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

@ -4286,7 +4286,7 @@ tooltip {
/***************** /*****************
* Color Chooser * * Color Chooser *
*****************/ *****************/
colorswatch, colorswatch:drop(active) { colorswatch:drop(active), colorswatch {
border-style: none; } border-style: none; }
colorswatch.top { colorswatch.top {
border-top-left-radius: 5.5px; border-top-left-radius: 5.5px;
@ -4333,10 +4333,9 @@ colorswatch:drop(active) {
border-color: #4e9a06; border-color: #4e9a06;
box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.3), inset 0 0 0 1px #4e9a06; } box-shadow: inset 0 0 0 2px rgba(0, 0, 0, 0.3), inset 0 0 0 1px #4e9a06; }
colorswatch overlay { colorswatch overlay {
box-shadow: inset 0 2px 2px -3px rgba(0, 0, 0, 0.7);
border: 1px solid rgba(0, 0, 0, 0.3); } border: 1px solid rgba(0, 0, 0, 0.3); }
colorswatch overlay:hover { colorswatch overlay:hover {
box-shadow: inset 0 1px rgba(255, 255, 255, 0.3); } box-shadow: inset 0 1px rgba(255, 255, 255, 0.4), inset 0 -1px rgba(0, 0, 0, 0.2); }
colorswatch overlay:backdrop, colorswatch overlay:backdrop:hover { colorswatch overlay:backdrop, colorswatch overlay:backdrop:hover {
border-color: rgba(0, 0, 0, 0.3); border-color: rgba(0, 0, 0, 0.3);
box-shadow: none; } box-shadow: none; }