OSD bg and general border changes

- darker, less transparent OSD
- brighter OSD border
- no border for over view panels and entry
- fix border color of popups
- remove trough variable as osd trough and popup trough cant have the same color if dependant on fg_color, fixed hex could also work
- thinner workspace border
This commit is contained in:
frederik.feichtmeier 2019-05-30 20:30:09 +02:00
parent 932dff9e32
commit 0d340a05e1
3 changed files with 19 additions and 19 deletions

View File

@ -22,11 +22,11 @@ $destructive_color: if($variant == 'light', #e01b24, darken(#e01b24, 10%));
$osd_fg_color: #eeeeec; $osd_fg_color: #eeeeec;
$osd_text_color: white; $osd_text_color: white;
$osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 4%),0.3); $osd_bg_color: transparentize(darken(desaturate(#3d3846, 100%), 12%),0.04);
$osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5); $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
$osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%); $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
$osd_borders_color: transparentize(black, 0.3); $osd_borders_color: transparentize(black, 0.3);
$osd_outer_borders_color: transparentize(white, 0.8); $osd_outer_borders_color: transparentize(white, 0.84);
$tooltip_borders_color: $osd_outer_borders_color; $tooltip_borders_color: $osd_outer_borders_color;
$shadow_color: transparentize(black, 0.9); $shadow_color: transparentize(black, 0.9);

View File

@ -30,8 +30,8 @@ $medium_radius: 9px;
$_trough_color: transparentize($fg_color, 0.9); $_trough_color: transparentize($fg_color, 0.9);
$_bubble_borders_color: lighten($borders_color, if($variant=='light', 0%, 5%)); $_bubble_borders_color: lighten($borders_color, if($variant=='light', 0%, 5%));
$_hover_bg_color: lighten($bg_color,if($variant=='light', 5%, 1%)); $_hover_bg_color: if($variant=='light', darken($bg_color, 5%), lighten($bg_color, 4%));
$_active_bg_color: if($variant == 'light', darken($bg_color, 14%), darken($bg_color, 9%)); $_active_bg_color: if($variant == 'light', darken($bg_color, 14%), darken($bg_color, 6%));
$font-size: 11; $font-size: 11;
$font-family: Cantarell, Sans-Serif; $font-family: Cantarell, Sans-Serif;
@ -135,7 +135,7 @@ StScrollBar {
.slider { .slider {
height: 1em; height: 1em;
-barlevel-height: 0.3em; -barlevel-height: 0.3em;
-barlevel-background-color: $_trough_color; //background of the trough -barlevel-background-color: transparentize($fg_color, 0.9); //background of the trough
-barlevel-border-color: $borders_color; //trough border color -barlevel-border-color: $borders_color; //trough border color
-barlevel-active-background-color: $selected_bg_color; //active trough fill -barlevel-active-background-color: $selected_bg_color; //active trough fill
-barlevel-active-border-color: $selected_borders_color; //active trough border -barlevel-active-border-color: $selected_borders_color; //active trough border
@ -540,7 +540,7 @@ StScrollBar {
.popup-menu { .popup-menu {
min-width: 15em; min-width: 15em;
color: $fg_color; color: $fg_color;
border-color: $borders_color; border-color: $_bubble_borders_color;
.popup-menu-arrow { } //defined globally in the TOP BAR .popup-menu-arrow { } //defined globally in the TOP BAR
.popup-sub-menu { .popup-sub-menu {
@ -590,7 +590,7 @@ StScrollBar {
-arrow-border-radius: $medium_radius; -arrow-border-radius: $medium_radius;
-arrow-background-color: $bg_color; -arrow-background-color: $bg_color;
-arrow-border-width: 1px; -arrow-border-width: 1px;
-arrow-border-color: $borders_color; -arrow-border-color: if($variant=='light', transparentize(black, 0.6), $borders_color);
-arrow-base: 24px; -arrow-base: 24px;
-arrow-rise: 11px; -arrow-rise: 11px;
-arrow-box-shadow: 0 1px 3px black; //dreaming. bug #689995 -arrow-box-shadow: 0 1px 3px black; //dreaming. bug #689995
@ -629,7 +629,7 @@ StScrollBar {
.level { .level {
height: 0.6em; height: 0.6em;
-barlevel-height: 0.6em; -barlevel-height: 0.6em;
-barlevel-background-color: $_trough_color; -barlevel-background-color: transparentize($fg_color, if($variant=='light', 0.2, 0.9));
-barlevel-active-background-color: $osd_fg_color; -barlevel-active-background-color: $osd_fg_color;
-barlevel-overdrive-color: $destructive_color; -barlevel-overdrive-color: $destructive_color;
-barlevel-overdrive-separator-width: 0.2em; -barlevel-overdrive-separator-width: 0.2em;
@ -758,7 +758,7 @@ StScrollBar {
%bubble-panel { %bubble-panel {
color: $fg_color; color: $fg_color;
background-color: $bg_color; background-color: $bg_color;
border: 1px solid $_bubble_borders_color; border: 1px solid if($variant=='light', transparentize(black, 0.6), $borders_color);
StEntry { @extend %bubble-entry; } StEntry { @extend %bubble-entry; }
.button { .button {
@ -1331,16 +1331,17 @@ StScrollBar {
border-radius: 6px; border-radius: 6px;
color: $osd_fg_color; color: $osd_fg_color;
background-color: $osd_bg_color; background-color: $osd_bg_color;
border-color: transparent;
&:focus { &:focus {
padding: 6px 8px; padding: 6px 8px;
border-width: 2px; border-width: 2px;
border-color: $selected_bg_color; border-color: $selected_bg_color;
} }
.search-entry-icon { icon-size: 1em; padding: 0 4px; color: transparentize($fg_color,.3); } .search-entry-icon { icon-size: 1em; padding: 0 4px; color: $osd_fg_color; }
&:hover, &:focus { &:hover, &:focus {
.search-entry-icon { color: $fg_color; } .search-entry-icon { color: transparentize($osd_fg_color,.3); }
} }
} }
@ -1381,7 +1382,6 @@ StScrollBar {
@extend %overview-panel; @extend %overview-panel;
font-size: 9pt; font-size: 9pt;
padding: 4px 0; padding: 4px 0;
border-left-width: 0px; /* sadly no workie */
border-radius: 0px 9px 9px 0px; border-radius: 0px 9px 9px 0px;
&:rtl { &:rtl {
@ -1562,7 +1562,7 @@ StScrollBar {
} }
} }
.workspace-thumbnail-indicator { .workspace-thumbnail-indicator {
border: 4px solid $selected_bg_color; border: 2px solid $selected_bg_color;
padding: 1px; padding: 1px;
} }
@ -1576,8 +1576,8 @@ StScrollBar {
%overview-panel { %overview-panel {
color: $osd_fg_color; color: $osd_fg_color;
background-color: $osd_bg_color; background-color: transparentize($osd_bg_color, 0.1);
border: 1px solid $osd_outer_borders_color; border: none;
} }
%status_text { %status_text {
@ -1873,9 +1873,9 @@ StScrollBar {
.modal-dialog-button { .modal-dialog-button {
padding: 4px 18px; padding: 4px 18px;
&:default { &:default {
@include button(normal,$c:$selected_bg_color); @include button(normal,$c:$selected_bg_color, $tc:$selected_fg_color);
&:hover,&:focus { @include button(hover,$c:$selected_bg_color); } &:hover,&:focus { @include button(hover,$c:$selected_bg_color, $tc:$selected_fg_color); }
&:active { @include button(active,$c:$selected_bg_color); } &:active { @include button(active,$c:$selected_bg_color, $tc:$selected_fg_color); }
&:insensitive { @include button(insensitive); } &:insensitive { @include button(insensitive); }
} }

View File

@ -148,7 +148,7 @@
color: $tc; color: $tc;
text-shadow: 0 1px black; text-shadow: 0 1px black;
icon-shadow: 0 1px black; icon-shadow: 0 1px black;
box-shadow: $_button_shadow, inset 0px 0px 0px 1px $selected_bg_color; box-shadow: inset 0px 0px 0px 1px $selected_bg_color;
} }
@else if $t==hover { @else if $t==hover {