diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index 69068f8a..f16916a4 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -98,7 +98,7 @@ $disabled_bg_color: if($variant == 'light', mix($bg_color, $base // Headerbar colors $header_bg: if($variant == 'light', #ffffff, #373737); -$dark_header_bg: if($trans == 'true', transparentize($base_color, 0.04), $base_color); +$dark_header_bg: if($trans == 'true', rgba($base_color, 0.95), $base_color); $header_highlight: if($variant == 'dark', #434343, #f5f5f5); $header_bg_backdrop: if($variant == 'light', darken($header_bg, 0%), darken($header_bg, 0%)); diff --git a/src/sass/gtk/_applications-3.0.scss b/src/sass/gtk/_applications-3.0.scss index 353d98a1..13cedb25 100644 --- a/src/sass/gtk/_applications-3.0.scss +++ b/src/sass/gtk/_applications-3.0.scss @@ -78,15 +78,15 @@ $nautilus_sidebar_image: image($dark_sidebar_bg); @if $nautilus_style == 'stable' { $nautilus_sidebar_image: linear-gradient(90deg, $dark_sidebar_bg 0%, $dark_sidebar_bg $nautilus_sidebar_size, - transparent $nautilus_sidebar_size, - transparent 100%); + rgba($dark_sidebar_bg, 0) $nautilus_sidebar_size, + rgba($dark_sidebar_bg, 0) 100%); $nautilus_bg_image: linear-gradient(90deg, $dark_sidebar_bg 0%, $dark_sidebar_bg $nautilus_sidebar_size, $nautilus_borders_color $nautilus_sidebar_size, $nautilus_borders_color ($nautilus_sidebar_size + 1px), - $base_color ($nautilus_sidebar_size + 1px), - $base_color 100%); + $dark_sidebar_bg ($nautilus_sidebar_size + 1px), + $dark_sidebar_bg 100%); } @if $nautilus_style == 'default' or $nautilus_style == 'glassy' { @@ -104,29 +104,33 @@ $nautilus_sidebar_image: image($dark_sidebar_bg); } @if $nautilus_style == 'default' or $nautilus_style == 'stable' { - $nautilus_header_borders_image: linear-gradient(90deg, transparent $nautilus_sidebar_size, + $nautilus_header_borders_image: linear-gradient(90deg, rgba($header_border, 0) $nautilus_sidebar_size, $header_border $nautilus_sidebar_size); } @if $nautilus_style == 'stable' or $nautilus_style == 'default' { @if $nautilus_version == 'new' { - $nautilus_header_image: linear-gradient(90deg, transparent $nautilus_sidebar_size, + $nautilus_header_image: linear-gradient(90deg, rgba($dark_header_bg, 0) $nautilus_sidebar_size, $nautilus_borders_color $nautilus_sidebar_size, $nautilus_borders_color ($nautilus_sidebar_size + 1px), - $base_color ($nautilus_sidebar_size + 1px)); + $dark_header_bg ($nautilus_sidebar_size + 1px)); } @else { $nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg $nautilus_sidebar_size, $nautilus_borders_color $nautilus_sidebar_size, $nautilus_borders_color ($nautilus_sidebar_size + 1px), - $base_color ($nautilus_sidebar_size + 1px)); + $dark_header_bg ($nautilus_sidebar_size + 1px)); } } @else if $nautilus_style == 'glassy' { + @if $nautilus_version == 'new' { + $nautilus_bg_image: image(rgba($dark_sidebar_bg, 0)); + } + $nautilus_header_image: linear-gradient(90deg, $dark_sidebar_bg ($nautilus_sidebar_size/2), $dark_header_bg 40%); - $nautilus_header_borders_image: linear-gradient(90deg, transparent (($nautilus_sidebar_size/2) - 40px), + $nautilus_header_borders_image: linear-gradient(90deg, rgba($header_border, 0) (($nautilus_sidebar_size/2) - 40px), $header_border 40%); } @@ -174,6 +178,10 @@ $nautilus_sidebar_image: image($dark_sidebar_bg); &.frame { border-right: 1px solid $nautilus_borders_color; } } + @if $nautilus_style == 'glassy' { + background-image: $nautilus_sidebar_image; + } + list { margin-bottom: 6px; } row.sidebar-row { diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index 3b27cab5..9508244f 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -96,14 +96,12 @@ $background_radius_style: 0 0 $wm_radius $wm_radius; $maximized_radius_style: 0 0 $maximized_radius $maximized_radius; .background { - // border-radius: 0 0 $wm_radius $wm_radius; color: $fg_color; background-color: rgba($bg_color, 1); - // > box > stack { background-color: $bg_color; } - &.csd { border-radius: $background_radius_style; // Set csd windows botttom border radius + background-color: rgba($bg_color, 0.999); &.maximized, &.tiled, &.fullscreen { border-radius: $maximized_radius_style; // Set csd windows botttom border radius