From 6b2f2115ff8487d97ce388bc8bdae6742038bcb9 Mon Sep 17 00:00:00 2001 From: Vince Date: Fri, 14 May 2021 21:45:33 +0800 Subject: [PATCH] update --- src/other/dash-to-dock/_dash-to-dock.scss | 4 ---- src/sass/_colors.scss | 5 ++++- src/sass/_variables.scss | 1 + src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss | 4 ---- src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss | 4 ---- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/src/other/dash-to-dock/_dash-to-dock.scss b/src/other/dash-to-dock/_dash-to-dock.scss index 7150c1c..e5cae5c 100644 --- a/src/other/dash-to-dock/_dash-to-dock.scss +++ b/src/other/dash-to-dock/_dash-to-dock.scss @@ -1,9 +1,5 @@ // Dash to Dock -$dash_panel_bg: if($variant == 'light', rgba(#f1f1f1, 0.15), rgba(#101010, 0.25)); -$dash_panel_fg: if($variant == 'light', black, white); -$dash_radius: 18px; - // Scrollview style .bottom #dashtodockDashScrollview, .top #dashtodockDashScrollview { diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index 9e63577..9bb2669 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -162,9 +162,12 @@ $panel_fg: if($trans == 'true', white, $text_color); @if $black == 'true' { $panel_fg: $text_color; } -$shell_panel: if($variant == 'light', rgba(white, $panel_opacity), rgba(black, $panel_opacity)); +$shell_panel: if($variant == 'light', rgba(white, $panel_opacity/2 + 0.08), rgba(black, $panel_opacity)); $shell_panel_bg: if($trans == 'true', $shell_panel, $panel_bg); +$dash_panel_bg: if($variant == 'light', rgba(#f1f1f1, $panel_opacity + 0.2), rgba(#222222, $panel_opacity/2 + 0.6)); +$dash_panel_fg: if($variant == 'light', black, white); + // Entry colors $entry_bg: if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05)); $entry_shell_bg: if($variant == 'light', rgba(black, 0.1), rgba(white, 0.1)); diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss index 8f85051..70c90d1 100644 --- a/src/sass/_variables.scss +++ b/src/sass/_variables.scss @@ -44,6 +44,7 @@ $bt_radius: 6px; $bd_radius: 8px; $wm_radius: 12px; $mn_radius: 10px; +$dash_radius: 18px; $base_border_radius: 8px; $modal_radius: $base_border_radius * 2; $maximized_radius: 0; diff --git a/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss index 41d93c1..e5ea440 100644 --- a/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss +++ b/src/sass/gnome-shell/extensions-3-28/_dash-to-dock.scss @@ -1,9 +1,5 @@ // Dash to Dock -$dash_panel_bg: if($variant == 'light', rgba(#f1f1f1, 0.15), rgba(#101010, 0.25)); -$dash_panel_fg: if($variant == 'light', black, white); -$dash_radius: 18px; - // Scrollview style .bottom #dashtodockDashScrollview, .top #dashtodockDashScrollview { diff --git a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss index 1370371..2de6e7b 100644 --- a/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss +++ b/src/sass/gnome-shell/extensions-40-0/_dash-to-dock.scss @@ -1,9 +1,5 @@ // Dash to Dock -$dash_panel_bg: if($variant == 'light', rgba(#f1f1f1, 0.35), rgba(#222222, 0.75)); -$dash_panel_fg: if($variant == 'light', black, white); -$dash_radius: 18px; - // Scrollview style .bottom #dashtodockDashScrollview, .top #dashtodockDashScrollview {