From 3dd968726d7b2d3cc7cf59bb1d63cd4674398a5d Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Sat, 11 Dec 2021 15:59:29 +0800
Subject: [PATCH] update

---
 src/main/gnome-shell/shell-3-28/gnome-shell-dark.css  | 6 +++---
 src/main/gnome-shell/shell-3-28/gnome-shell-light.css | 6 +++---
 src/main/gnome-shell/shell-3-28/gnome-shell.css       | 6 +++---
 src/main/gnome-shell/shell-40-0/gnome-shell-dark.css  | 9 +++++----
 src/main/gnome-shell/shell-40-0/gnome-shell-light.css | 9 +++++----
 src/main/gnome-shell/shell-40-0/gnome-shell.css       | 9 +++++----
 src/sass/gnome-shell/_variables.scss                  | 1 +
 src/sass/gnome-shell/common/_app-grid.scss            | 6 +++---
 src/sass/gnome-shell/widgets-40-0/_dash.scss          | 3 ++-
 9 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css b/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css
index 3f98236c..6c5cad38 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-dark.css
@@ -51,7 +51,7 @@ stage {
 .app-well-app .overview-icon,
 .grid-search-result .overview-icon {
   color: rgba(255, 255, 255, 0.7);
-  border-radius: 9px;
+  border-radius: 16px;
   padding: 6px;
   border: none;
   transition-duration: 100ms;
@@ -80,7 +80,7 @@ stage {
 }
 
 .app-well-app.app-folder {
-  border-radius: 12px;
+  border-radius: 16px;
 }
 
 .app-well-app.app-folder, .app-well-app.app-folder:hover, .app-well-app.app-folder:active {
@@ -89,7 +89,7 @@ stage {
 
 .app-well-app.app-folder .overview-icon {
   background-color: rgba(255, 255, 255, 0.12);
-  border-radius: 12px;
+  border-radius: 16px;
 }
 
 .app-well-app.app-folder:hover .overview-icon {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell-light.css b/src/main/gnome-shell/shell-3-28/gnome-shell-light.css
index 3b93a95e..49510d4d 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell-light.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell-light.css
@@ -51,7 +51,7 @@ stage {
 .app-well-app .overview-icon,
 .grid-search-result .overview-icon {
   color: rgba(255, 255, 255, 0.7);
-  border-radius: 9px;
+  border-radius: 16px;
   padding: 6px;
   border: none;
   transition-duration: 100ms;
@@ -80,7 +80,7 @@ stage {
 }
 
 .app-well-app.app-folder {
-  border-radius: 12px;
+  border-radius: 16px;
 }
 
 .app-well-app.app-folder, .app-well-app.app-folder:hover, .app-well-app.app-folder:active {
@@ -89,7 +89,7 @@ stage {
 
 .app-well-app.app-folder .overview-icon {
   background-color: rgba(255, 255, 255, 0.12);
-  border-radius: 12px;
+  border-radius: 16px;
 }
 
 .app-well-app.app-folder:hover .overview-icon {
diff --git a/src/main/gnome-shell/shell-3-28/gnome-shell.css b/src/main/gnome-shell/shell-3-28/gnome-shell.css
index d721ffcb..d6900c46 100644
--- a/src/main/gnome-shell/shell-3-28/gnome-shell.css
+++ b/src/main/gnome-shell/shell-3-28/gnome-shell.css
@@ -51,7 +51,7 @@ stage {
 .app-well-app .overview-icon,
 .grid-search-result .overview-icon {
   color: rgba(255, 255, 255, 0.7);
-  border-radius: 9px;
+  border-radius: 16px;
   padding: 6px;
   border: none;
   transition-duration: 100ms;
@@ -80,7 +80,7 @@ stage {
 }
 
 .app-well-app.app-folder {
-  border-radius: 12px;
+  border-radius: 16px;
 }
 
 .app-well-app.app-folder, .app-well-app.app-folder:hover, .app-well-app.app-folder:active {
@@ -89,7 +89,7 @@ stage {
 
 .app-well-app.app-folder .overview-icon {
   background-color: rgba(255, 255, 255, 0.12);
-  border-radius: 12px;
+  border-radius: 16px;
 }
 
 .app-well-app.app-folder:hover .overview-icon {
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css b/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css
index 7cd9653b..c33cab7b 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-dark.css
@@ -51,7 +51,7 @@ stage {
 .app-well-app .overview-icon,
 .grid-search-result .overview-icon {
   color: rgba(255, 255, 255, 0.7);
-  border-radius: 9px;
+  border-radius: 16px;
   padding: 6px;
   border: none;
   transition-duration: 100ms;
@@ -80,7 +80,7 @@ stage {
 }
 
 .app-well-app.app-folder {
-  border-radius: 12px;
+  border-radius: 16px;
 }
 
 .app-well-app.app-folder, .app-well-app.app-folder:hover, .app-well-app.app-folder:active {
@@ -89,7 +89,7 @@ stage {
 
 .app-well-app.app-folder .overview-icon {
   background-color: rgba(255, 255, 255, 0.12);
-  border-radius: 12px;
+  border-radius: 16px;
 }
 
 .app-well-app.app-folder:hover .overview-icon {
@@ -2991,7 +2991,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(255, 255, 255, 0.3);
   margin-bottom: 16px;
   padding: 10px;
-  border-radius: 16px;
+  border-radius: 24px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
 }
 
 .dash-item-container .app-well-app, .show-apps {
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell-light.css b/src/main/gnome-shell/shell-40-0/gnome-shell-light.css
index 4f13cb89..0cb30acd 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell-light.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell-light.css
@@ -51,7 +51,7 @@ stage {
 .app-well-app .overview-icon,
 .grid-search-result .overview-icon {
   color: rgba(255, 255, 255, 0.7);
-  border-radius: 9px;
+  border-radius: 16px;
   padding: 6px;
   border: none;
   transition-duration: 100ms;
@@ -80,7 +80,7 @@ stage {
 }
 
 .app-well-app.app-folder {
-  border-radius: 12px;
+  border-radius: 16px;
 }
 
 .app-well-app.app-folder, .app-well-app.app-folder:hover, .app-well-app.app-folder:active {
@@ -89,7 +89,7 @@ stage {
 
 .app-well-app.app-folder .overview-icon {
   background-color: rgba(255, 255, 255, 0.12);
-  border-radius: 12px;
+  border-radius: 16px;
 }
 
 .app-well-app.app-folder:hover .overview-icon {
@@ -2991,7 +2991,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(0, 0, 0, 0.26);
   margin-bottom: 16px;
   padding: 10px;
-  border-radius: 16px;
+  border-radius: 24px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
 }
 
 .dash-item-container .app-well-app, .show-apps {
diff --git a/src/main/gnome-shell/shell-40-0/gnome-shell.css b/src/main/gnome-shell/shell-40-0/gnome-shell.css
index f8fe0077..9e7b7bf5 100644
--- a/src/main/gnome-shell/shell-40-0/gnome-shell.css
+++ b/src/main/gnome-shell/shell-40-0/gnome-shell.css
@@ -51,7 +51,7 @@ stage {
 .app-well-app .overview-icon,
 .grid-search-result .overview-icon {
   color: rgba(255, 255, 255, 0.7);
-  border-radius: 9px;
+  border-radius: 16px;
   padding: 6px;
   border: none;
   transition-duration: 100ms;
@@ -80,7 +80,7 @@ stage {
 }
 
 .app-well-app.app-folder {
-  border-radius: 12px;
+  border-radius: 16px;
 }
 
 .app-well-app.app-folder, .app-well-app.app-folder:hover, .app-well-app.app-folder:active {
@@ -89,7 +89,7 @@ stage {
 
 .app-well-app.app-folder .overview-icon {
   background-color: rgba(255, 255, 255, 0.12);
-  border-radius: 12px;
+  border-radius: 16px;
 }
 
 .app-well-app.app-folder:hover .overview-icon {
@@ -2991,7 +2991,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
   background-color: rgba(255, 255, 255, 0.3);
   margin-bottom: 16px;
   padding: 10px;
-  border-radius: 16px;
+  border-radius: 24px;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.08);
 }
 
 .dash-item-container .app-well-app, .show-apps {
diff --git a/src/sass/gnome-shell/_variables.scss b/src/sass/gnome-shell/_variables.scss
index f5ccb6cc..39cee912 100644
--- a/src/sass/gnome-shell/_variables.scss
+++ b/src/sass/gnome-shell/_variables.scss
@@ -15,6 +15,7 @@ $base_spacing: if($compact == 'false', 6px, 4px);
 // radiuses
 $circular_radius: 9999px;
 $base_radius: 6px;
+$icon_radius: 16px;
 $window_radius: 12px;
 $menu_radius: $base_radius + $base_padding;
 $modal_radius: $menu_radius;
diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss
index b87fde51..53b42df7 100644
--- a/src/sass/gnome-shell/common/_app-grid.scss
+++ b/src/sass/gnome-shell/common/_app-grid.scss
@@ -6,7 +6,7 @@
 %app-well-app {
   & .overview-icon {
     color: on($osd, secondary);
-    border-radius: $base_radius * 1.5;
+    border-radius: $icon_radius;
     padding: $base_padding;
     border: none;
     transition-duration: 100ms;
@@ -30,7 +30,7 @@
 
 // App Folders
 .app-well-app.app-folder {
-  border-radius: $base_radius * 2;
+  border-radius: $icon_radius;
 
   &, &:hover, &:active {
     background-color: transparent;
@@ -38,7 +38,7 @@
 
   .overview-icon {
     background-color: on(black, divider);
-    border-radius: $base_radius * 2;
+    border-radius: $icon_radius;
   }
 
   &:hover .overview-icon {
diff --git a/src/sass/gnome-shell/widgets-40-0/_dash.scss b/src/sass/gnome-shell/widgets-40-0/_dash.scss
index 3d97e975..24148f2f 100644
--- a/src/sass/gnome-shell/widgets-40-0/_dash.scss
+++ b/src/sass/gnome-shell/widgets-40-0/_dash.scss
@@ -3,7 +3,7 @@ $dash_placeholder_size: 32px;
 $dash_padding: 10px; // 10px
 $dash_spacing: 2px;
 $dash_bottom_margin: 16px;
-$dash_border_radius: $base_radius + $dash_padding;
+$dash_border_radius: $icon_radius + $dash_padding - $dash_spacing;
 
 #dash {
   margin-top: $base_spacing * 2;
@@ -25,6 +25,7 @@ $dash_border_radius: $base_radius + $dash_padding;
   margin-bottom: $dash_bottom_margin;
   padding: $dash_padding;
   border-radius: $dash_border_radius;
+  box-shadow: inset 0 1px rgba(white, 0.08);
 }
 
 // Dash Items