Adwaita: cosmetics

This commit is contained in:
Lapo Calamandrei 2016-04-21 16:51:24 +02:00
parent 874d4ede67
commit d857ba3faf

View File

@ -192,8 +192,8 @@
//
color: $tc;
outline-color: transparentize($tc, 0.7);
border-color: if($c!=$bg_color, _border_color($c), $borders_color);
border-bottom-color: if($c!=$bg_color, _border_color($c, true), $alt_borders_color);
border-color: if($c != $bg_color, _border_color($c), $borders_color);
border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
@if $variant == 'light' { background-image: linear-gradient(to bottom, $c, darken($c, 4%) 60%, darken($c, 10%)); }
@else { background-image: linear-gradient(to bottom, darken($c, 2%), darken($c, 4%) 60%, darken($c, 6%)); }
@include _button_text_shadow($tc, $c);
@ -206,11 +206,11 @@
//
color: $tc;
outline-color: transparentize($tc, 0.7);
border-color: if($c!=$bg_color, _border_color($c), $borders_color);
border-bottom-color: if($c!=$bg_color, _border_color($c, true), $alt_borders_color);
border-color: if($c != $bg_color, _border_color($c), $borders_color);
border-bottom-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
@if $variant == 'light' {
background-image: linear-gradient(to bottom, lighten($c, 6%), $c 60%, darken($c, 4%));
@include _button_text_shadow($tc,lighten($c, 6%));
@include _button_text_shadow($tc, lighten($c, 6%));
@include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)), $_button_edge);
}
@else {
@ -226,7 +226,7 @@
//
color: $tc;
outline-color: transparentize($tc, 0.7);
border-color: if($c!=$bg_color, _border_color($c, true), $alt_borders_color);
border-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
@include _button_text_shadow($tc, $c);
@if $variant == 'light' {
background-image: linear-gradient(to bottom, lighten($c, 5%) 20%, $c 90%);
@ -250,7 +250,7 @@
//
color: $tc;
outline-color: transparentize($tc, 0.7);
border-color: if($c!=$bg_color, _border_color($c, true), $alt_borders_color);
border-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
@if $variant == 'light' {
background-image: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%);
box-shadow: inset 0 1px _button_hilight_color(lighten($c, 6%)),
@ -274,11 +274,10 @@
//
color: $tc;
outline-color: transparentize($tc, 0.7);
border-color: if($c!=$bg_color, _border_color($c), $borders_color);
border-color: if($c != $bg_color, _border_color($c), $borders_color);
background-image: none;
background-color: if($variant == 'light', darken($c, 8%), darken($c, 6%));
@include _shadows(inset 0 1px transparentize($_hilight_color, 1),
$_button_edge);
@include _shadows(inset 0 1px transparentize($_hilight_color, 1), $_button_edge);
text-shadow: none;
-gtk-icon-shadow: none;
@ -287,12 +286,11 @@
//
// insensitive button
//
$_bg: if($c!=$bg_color, mix($c, $base_color, 85%), $insensitive_bg_color);
$_bg: if($c != $bg_color, mix($c, $base_color, 85%), $insensitive_bg_color);
label, & { color: if($tc!=$fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color); }
label, & { color: if($tc != $fg_color, mix($tc, $_bg, 50%), $insensitive_fg_color); }
border-color: if($c!=$bg_color, _border_color($c),
$insensitive_borders_color);
border-color: if($c != $bg_color, _border_color($c), $insensitive_borders_color);
background-color: $_bg;
background-image: none;
text-shadow: none;
@ -306,9 +304,9 @@
// insensitive pushed button
//
$_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 6%));
$_bc: if($c!=$bg_color, _border_color($c), $insensitive_borders_color);
$_bc: if($c != $bg_color, _border_color($c), $insensitive_borders_color);
label, & { color: if($c!=$bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color); }
label, & { color: if($c != $bg_color, mix($tc, $_bg, 60%), $insensitive_fg_color); }
border-color: $_bc;
background-color: $_bg;
@ -322,34 +320,32 @@
//
// backdrop button
//
$_bg: if($c!=$bg_color,$c,$backdrop_bg_color);
$_bc: if($variant=='light',$c,_border_color($c));
$_bg: if($c != $bg_color, $c, $backdrop_bg_color);
$_bc: if($variant == 'light', $c, _border_color($c));
label, & { color: if($tc!=$fg_color,mix($tc, $_bg, 80%), $backdrop_fg_color); }
label, & { color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color); }
border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color);
border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
background-color: transparent;
background-image: image($_bg);
text-shadow: none;
-gtk-icon-shadow: none;
@include _shadows(inset 0 1px transparentize(white, 1),
$_blank_edge);
@include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
}
@else if $t==backdrop-active {
//
// backdrop pushed button FIXME no colors here!
//
$_bg: if($c!=$bg_color, darken($c, 10%), $backdrop_dark_fill);
$_bc: if($variant=='light',$_bg,_border_color($c));
$_bg: if($c != $bg_color, darken($c, 10%), $backdrop_dark_fill);
$_bc: if($variant == 'light', $_bg,_border_color($c));
label, & { color: if($tc!=$fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color); }
label, & { color: if($tc != $fg_color, mix($tc, $_bg, 80%), $backdrop_fg_color); }
border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color);
border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
background-color: $_bg;
background-image: none;
@include _shadows(inset 0 1px transparentize(white, 1),
$_blank_edge);
@include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
}
@else if $t==backdrop-insensitive {
@ -357,20 +353,19 @@
// backdrop insensitive button
//
$_bg: if($c!=$bg_color, mix($c, $base_color, 85%), $insensitive_bg_color);
$_bc: if($variant=='light', $_bg,_border_color($c));
$_bg: if($c != $bg_color, mix($c, $base_color, 85%), $insensitive_bg_color);
$_bc: if($variant == 'light', $_bg,_border_color($c));
label, & { color: if($c!=$bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); }
label, & { color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); }
border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color);
border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
background-color: $_bg;
background-image: none;
text-shadow: none;
-gtk-icon-shadow: none;
// white with 0 alpha to avoid an ugly transition, since no color means
// black with 0 alpha
@include _shadows(inset 0 1px transparentize(white, 1),
$_blank_edge);
@include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
}
@else if $t==backdrop-insensitive-active {
@ -379,23 +374,21 @@
//
$_bg: if($variant == 'light', darken(mix($c, $base_color, 85%), 8%), darken(mix($c, $base_color, 85%), 6%));
$_bc: if($variant=='light', $_bg,_border_color($c));
$_bc: if($variant == 'light', $_bg, _border_color($c));
label { color: if($c!=$bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); }
label { color: if($c != $bg_color, mix($tc, $_bg, 35%), $backdrop_insensitive_color); }
border-color: if($c!=$bg_color, $_bc, $backdrop_borders_color);
border-color: if($c != $bg_color, $_bc, $backdrop_borders_color);
background-color: $_bg;
background-image: none;
@include _shadows(inset 0 1px transparentize(white, 1),
$_blank_edge);
@include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
}
@else if $t==osd {
//
// normal osd button
//
$_bg: if($c!=$bg_color, transparentize($c, 0.5),
$osd_bg_color);
$_bg: if($c != $bg_color, transparentize($c, 0.5), $osd_bg_color);
color: $osd_fg_color;
border-color: $osd_borders_color;
@ -411,8 +404,7 @@
//
// active osd button
//
$_bg: if($c!=$bg_color, transparentize($c, 0.3),
lighten($osd_bg_color, 12%));
$_bg: if($c != $bg_color, transparentize($c, 0.3), lighten($osd_bg_color, 12%));
color: white;
border-color: $osd_borders_color;
@ -428,7 +420,7 @@
//
// active osd button
//
$_bg: if($c!=$bg_color, $c, $osd_borders_color);
$_bg: if($c != $bg_color, $c, $osd_borders_color);
color: white;
border-color: $osd_borders_color;
@ -457,8 +449,7 @@
//
// backdrop osd button
//
$_bg: if($c!=$bg_color, transparentize($c, 0.5),
$osd_bg_color);
$_bg: if($c != $bg_color, transparentize($c, 0.5), $osd_bg_color);
color: $osd_fg_color;
border-color: $osd_borders_color;
@ -477,8 +468,7 @@
background-color: transparent;
background-image: none;
@include _shadows(inset 0 1px transparentize(white, 1),
$_blank_edge);
@include _shadows(inset 0 1px transparentize(white, 1), $_blank_edge);
text-shadow: none;
-gtk-icon-shadow: none;