From a6e09d9b5f45fe137bd2fe1be912b0a9b6248cf5 Mon Sep 17 00:00:00 2001 From: Csaba Jakosa Date: Tue, 12 Apr 2016 16:23:43 +0200 Subject: [PATCH] * Fix backdrop->selected font color and frame (border color). (#324) --- gtk-3.20/scss/_global.scss | 6 +++--- gtk-3.20/scss/widgets/_view.scss | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/gtk-3.20/scss/_global.scss b/gtk-3.20/scss/_global.scss index 8cf0144..94dc3e9 100755 --- a/gtk-3.20/scss/_global.scss +++ b/gtk-3.20/scss/_global.scss @@ -13,7 +13,7 @@ $tooltip_bg_color: #444; $tooltip_fg_color: #eee; $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)); // dark colors @@ -103,8 +103,8 @@ $backdrop_text_color: mix($backdrop_base_color, $text_color, .8); $backdrop_bg_color: $bg_color; $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_selected_fg_color: if($variant == 'light', $backdrop_base_color, $backdrop_text_color); -$backdrop_borders_color: mix($borders_color, $bg_color, .9); +$backdrop_selected_fg_color: if($variant == 'light', $backdrop_text_color, $backdrop_base_color); +$backdrop_borders_color: mix($bg_color, $borders_color, .9); $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, .35); $backdrop_sidebar_bg_color: mix($backdrop_bg_color, $backdrop_base_color, .5); diff --git a/gtk-3.20/scss/widgets/_view.scss b/gtk-3.20/scss/widgets/_view.scss index 5c9825a..9ed5b16 100644 --- a/gtk-3.20/scss/widgets/_view.scss +++ b/gtk-3.20/scss/widgets/_view.scss @@ -17,7 +17,7 @@ &:focus, & { @extend %selected_items; - border-radius: 3px; + border-radius: $roundness; } } } @@ -338,10 +338,12 @@ ***********/ @include exports("frame") { - .frame { - border: 1px solid border_normal($bg_color); + frame > border, .frame { + 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 */