forked from AuroraMiddleware/gtk
Adwaita: drawing functions housekeeping
This commit is contained in:
parent
17b679c866
commit
378c290150
@ -36,20 +36,19 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
|
|||||||
$base_color 90%);
|
$base_color 90%);
|
||||||
// we need to match the same shadow types (inset/outset) in various states
|
// we need to match the same shadow types (inset/outset) in various states
|
||||||
// hence transparent shadows istead of resetting them when not needed
|
// hence transparent shadows istead of resetting them when not needed
|
||||||
$_blank_inner_shadows: inset 0 2px 2px -2px transparentize(
|
$_blank_inner_shadows: inset 0 2px 2px -2px
|
||||||
mix(black, $base_color, 50%),1),
|
transparentize(mix(black, $base_color, 50%),1),
|
||||||
inset 0 0 2px 1px transparentize(
|
inset 0 0 2px 1px
|
||||||
mix($fc,$base_color,20%),1);
|
transparentize(mix($fc,$base_color,20%),1);
|
||||||
$_blank_edge: if($noedge, none, 0 1px transparentize(white,1));
|
|
||||||
|
|
||||||
$_entry_edge: $widget_edge;
|
$_blank_edge: if($noedge, none, 0 1px transparentize(white,1));
|
||||||
@if $noedge { $_entry_edge: none; }
|
$_entry_edge: if($noedge, none, $widget_edge);
|
||||||
|
|
||||||
@if $t==normal {
|
@if $t==normal {
|
||||||
border-color: $borders_color;
|
border-color: $borders_color;
|
||||||
@include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
|
@include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
|
||||||
inset 0 0 2px 1px transparentize(
|
inset 0 0 2px 1px
|
||||||
mix($fc,$base_color,20%),1),
|
transparentize(mix($fc,$base_color, 20%),1),
|
||||||
$_entry_edge);
|
$_entry_edge);
|
||||||
// the second transparent shadow is needed for the transition to work
|
// the second transparent shadow is needed for the transition to work
|
||||||
}
|
}
|
||||||
@ -57,7 +56,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
|
|||||||
@if $variant == 'light' {
|
@if $variant == 'light' {
|
||||||
border-color: $fc;
|
border-color: $fc;
|
||||||
@include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
|
@include _shadows(inset 0 2px 2px -2px mix(black, $base_color, 50%),
|
||||||
inset 0 0 2px 1px mix($fc,$base_color,20%),
|
inset 0 0 2px 1px mix($fc,$base_color, 20%),
|
||||||
$_entry_edge);
|
$_entry_edge);
|
||||||
}
|
}
|
||||||
@else {
|
@else {
|
||||||
@ -116,7 +115,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@mixin button($t, $c:$bg_color, $tc:$fg_color, $noedge:false ) {
|
@mixin button($t, $c:$bg_color, $tc:$fg_color, $noedge:false) {
|
||||||
//
|
//
|
||||||
// Button drawing function
|
// Button drawing function
|
||||||
//
|
//
|
||||||
@ -135,7 +134,6 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
|
|||||||
$_top_hilight: if(lightness($c)> 70%, white, transparentize(white,0.9)); //not just dark/light but colored buttons
|
$_top_hilight: if(lightness($c)> 70%, white, transparentize(white,0.9)); //not just dark/light but colored buttons
|
||||||
|
|
||||||
@if $t==normal {
|
@if $t==normal {
|
||||||
|
|
||||||
//
|
//
|
||||||
// normal button
|
// normal button
|
||||||
//
|
//
|
||||||
@ -303,8 +301,10 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
|
|||||||
border-color: $osd_borders_color;
|
border-color: $osd_borders_color;
|
||||||
color: $insensitive_fg_color;
|
color: $insensitive_fg_color;
|
||||||
}
|
}
|
||||||
|
|
||||||
@else if $t==undecorated {
|
@else if $t==undecorated {
|
||||||
|
//
|
||||||
|
// reset
|
||||||
|
//
|
||||||
border-color: transparent;
|
border-color: transparent;
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
background-image: none;
|
background-image: none;
|
||||||
@ -319,25 +319,23 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
|
|||||||
@if $flat { background-image: linear-gradient(to bottom,$c); }
|
@if $flat { background-image: linear-gradient(to bottom,$c); }
|
||||||
@else {
|
@else {
|
||||||
background-image: linear-gradient(to bottom,
|
background-image: linear-gradient(to bottom,
|
||||||
mix(black,$c,15%) 5%,
|
mix(black,$c,15%) 5%,
|
||||||
mix(black,$c,10%) 20%,
|
mix(black,$c,10%) 20%,
|
||||||
mix(black,$c,10%) 90%,
|
mix(black,$c,10%) 90%,
|
||||||
$c
|
$c);
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@if $c!=$bg_color { border-color: _border_color($c); }
|
border-color: if($c!=$bg_color, _border_color($c), $border_color);
|
||||||
@else { border-color: $borders_color; }
|
|
||||||
|
|
||||||
@if $noedge==false {
|
@if not($noedge) {
|
||||||
@if lightness($c) > 60% {
|
@if lightness($c) > 60% {
|
||||||
box-shadow: inset 0 -1px 0 $borders_edge,
|
box-shadow: inset 0 -1px $borders_edge,
|
||||||
0 1px 0 $borders_edge;
|
0 1px $borders_edge;
|
||||||
}
|
}
|
||||||
@else {
|
@else {
|
||||||
box-shadow: inset 0 -1px 0 transparentize($borders_edge,0.5),
|
box-shadow: inset 0 -1px transparentize($borders_edge,0.5),
|
||||||
0 1px 0 transparentize($borders_edge,0.5);
|
0 1px transparentize($borders_edge,0.5);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@else { box-shadow: none; }
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user