* Fix backdrop->selected font color and frame (border color). (#324)

pull/329/head
Csaba Jakosa 2016-04-12 16:23:43 +02:00 committed by Dustin Falgout
parent c6cd4c56a6
commit a6e09d9b5f
2 changed files with 9 additions and 7 deletions

View File

@ -13,7 +13,7 @@ $tooltip_bg_color: #444;
$tooltip_fg_color: #eee; $tooltip_fg_color: #eee;
$selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%)); $selected_borders_color: if($variant == 'light', darken($selected_bg_color, 30%), darken($selected_bg_color, 20%));
$borders_color: if($variant == 'light', darken($bg_color, 15%), darken($bg_color, 12%)); $borders_color: if($variant == 'light', shade($bg_color, .85), shade($bg_color, .88));
$borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93)); $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
// dark colors // dark colors
@ -103,8 +103,8 @@ $backdrop_text_color: mix($backdrop_base_color, $text_color, .8);
$backdrop_bg_color: $bg_color; $backdrop_bg_color: $bg_color;
$backdrop_fg_color: mix($fg_color, $backdrop_bg_color, .5); $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, .5);
$backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%)); $backdrop_insensitive_color: if($variant == 'light', darken($backdrop_bg_color, 15%), lighten($backdrop_bg_color, 15%));
$backdrop_selected_fg_color: if($variant == 'light', $backdrop_base_color, $backdrop_text_color); $backdrop_selected_fg_color: if($variant == 'light', $backdrop_text_color, $backdrop_base_color);
$backdrop_borders_color: mix($borders_color, $bg_color, .9); $backdrop_borders_color: mix($bg_color, $borders_color, .9);
$backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, .35); $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, .35);
$backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, .5); $backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, .5);

View File

@ -17,7 +17,7 @@
&:focus, & { &:focus, & {
@extend %selected_items; @extend %selected_items;
border-radius: 3px; border-radius: $roundness;
} }
} }
} }
@ -338,10 +338,12 @@
***********/ ***********/
@include exports("frame") { @include exports("frame") {
.frame { frame > border, .frame {
border: 1px solid border_normal($bg_color); border: 1px solid $borders_color;
&.flat { border: 0; } &.flat { border-style: none; }
&:backdrop { border-color: $backdrop_borders_color; }
} }
/* avoid double borders when a viewport is packed into a GtkScrolledWindow */ /* avoid double borders when a viewport is packed into a GtkScrolledWindow */