From 1bb264824787f3f99ecd6821cbfc3f210b0f3a16 Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Sat, 22 Jan 2022 11:48:06 +0800
Subject: [PATCH] Fixed issues

---
 src/main/gtk-3.0/gtk-dark.css     | 16 ++++++++++++++++
 src/main/gtk-3.0/gtk-light.css    | 16 ++++++++++++++++
 src/main/gtk-3.0/gtk.css          | 16 ++++++++++++++++
 src/main/gtk-4.0/gtk-dark.css     | 12 ++----------
 src/main/gtk-4.0/gtk-light.css    | 12 ++----------
 src/main/gtk-4.0/gtk.css          | 12 ++----------
 src/sass/gtk/_common-3.0.scss     | 13 +++++++++++++
 src/sass/gtk/_common-4.0.scss     | 12 ++----------
 src/sass/gtk/apps/_gnome-3.0.scss | 32 ++++++++++++++++---------------
 9 files changed, 86 insertions(+), 55 deletions(-)

diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css
index d5673558..33239eff 100644
--- a/src/main/gtk-3.0/gtk-dark.css
+++ b/src/main/gtk-3.0/gtk-dark.css
@@ -3205,6 +3205,22 @@ popover.background toolbar {
   background-color: #3C3C3C;
 }
 
+popover.background.combo viewport.frame > list {
+  background-color: transparent;
+}
+
+popover.background.combo viewport.frame > list > row {
+  padding: 6px 12px;
+}
+
+popover.background.combo viewport.frame > list > row:first-child {
+  border-radius: 12px 12px 0 0;
+}
+
+popover.background.combo viewport.frame > list > row:last-child {
+  border-radius: 0 0 12px 12px;
+}
+
 popover.background .linked > button:not(.radio) {
   border-radius: 6px;
 }
diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css
index 32e52f10..8179a21d 100644
--- a/src/main/gtk-3.0/gtk-light.css
+++ b/src/main/gtk-3.0/gtk-light.css
@@ -3205,6 +3205,22 @@ popover.background toolbar {
   background-color: #FFFFFF;
 }
 
+popover.background.combo viewport.frame > list {
+  background-color: transparent;
+}
+
+popover.background.combo viewport.frame > list > row {
+  padding: 6px 12px;
+}
+
+popover.background.combo viewport.frame > list > row:first-child {
+  border-radius: 12px 12px 0 0;
+}
+
+popover.background.combo viewport.frame > list > row:last-child {
+  border-radius: 0 0 12px 12px;
+}
+
 popover.background .linked > button:not(.radio) {
   border-radius: 6px;
 }
diff --git a/src/main/gtk-3.0/gtk.css b/src/main/gtk-3.0/gtk.css
index 3f1fa812..950dcf89 100644
--- a/src/main/gtk-3.0/gtk.css
+++ b/src/main/gtk-3.0/gtk.css
@@ -3205,6 +3205,22 @@ popover.background toolbar {
   background-color: #FFFFFF;
 }
 
+popover.background.combo viewport.frame > list {
+  background-color: transparent;
+}
+
+popover.background.combo viewport.frame > list > row {
+  padding: 6px 12px;
+}
+
+popover.background.combo viewport.frame > list > row:first-child {
+  border-radius: 12px 12px 0 0;
+}
+
+popover.background.combo viewport.frame > list > row:last-child {
+  border-radius: 0 0 12px 12px;
+}
+
 popover.background .linked > button:not(.radio) {
   border-radius: 6px;
 }
diff --git a/src/main/gtk-4.0/gtk-dark.css b/src/main/gtk-4.0/gtk-dark.css
index b92131f4..35adb095 100644
--- a/src/main/gtk-4.0/gtk-dark.css
+++ b/src/main/gtk-4.0/gtk-dark.css
@@ -1371,10 +1371,6 @@ headerbar button:backdrop:checked:disabled:not(.suggested-action):not(.destructi
   color: rgba(255, 255, 255, 0.5);
 }
 
-.titlebar button.toggle {
-  border-radius: 9999px;
-}
-
 .titlebar stackswitcher {
   margin: 6px 0;
   border-radius: 9999px;
@@ -3421,17 +3417,13 @@ window.dialog.message .titlebar:backdrop {
   color: rgba(255, 255, 255, 0.7);
 }
 
-window.dialog.message.csd.background {
-  border-bottom-left-radius: 12px;
-  border-bottom-right-radius: 12px;
-}
-
 window.dialog.message.csd .dialog-action-area {
   margin-top: -6px;
+  padding: 6px;
 }
 
 window.dialog.message.csd .dialog-action-area > button, window.dialog.message.csd .dialog-action-area > button:first-child, window.dialog.message.csd .dialog-action-area > button:last-child {
-  border-radius: 9999px;
+  border-radius: 6px;
 }
 
 window.dialog.message.csd .dialog-action-area > button:not(:last-child) {
diff --git a/src/main/gtk-4.0/gtk-light.css b/src/main/gtk-4.0/gtk-light.css
index f8ec42e2..de6cc838 100644
--- a/src/main/gtk-4.0/gtk-light.css
+++ b/src/main/gtk-4.0/gtk-light.css
@@ -1371,10 +1371,6 @@ headerbar button:backdrop:checked:disabled:not(.suggested-action):not(.destructi
   color: rgba(0, 0, 0, 0.38);
 }
 
-.titlebar button.toggle {
-  border-radius: 9999px;
-}
-
 .titlebar stackswitcher {
   margin: 6px 0;
   border-radius: 9999px;
@@ -3421,17 +3417,13 @@ window.dialog.message .titlebar:backdrop {
   color: rgba(0, 0, 0, 0.6);
 }
 
-window.dialog.message.csd.background {
-  border-bottom-left-radius: 12px;
-  border-bottom-right-radius: 12px;
-}
-
 window.dialog.message.csd .dialog-action-area {
   margin-top: -6px;
+  padding: 6px;
 }
 
 window.dialog.message.csd .dialog-action-area > button, window.dialog.message.csd .dialog-action-area > button:first-child, window.dialog.message.csd .dialog-action-area > button:last-child {
-  border-radius: 9999px;
+  border-radius: 6px;
 }
 
 window.dialog.message.csd .dialog-action-area > button:not(:last-child) {
diff --git a/src/main/gtk-4.0/gtk.css b/src/main/gtk-4.0/gtk.css
index 5f499312..1fa107d0 100644
--- a/src/main/gtk-4.0/gtk.css
+++ b/src/main/gtk-4.0/gtk.css
@@ -1371,10 +1371,6 @@ headerbar button:backdrop:checked:disabled:not(.suggested-action):not(.destructi
   color: rgba(255, 255, 255, 0.5);
 }
 
-.titlebar button.toggle {
-  border-radius: 9999px;
-}
-
 .titlebar stackswitcher {
   margin: 6px 0;
   border-radius: 9999px;
@@ -3421,17 +3417,13 @@ window.dialog.message .titlebar:backdrop {
   color: rgba(0, 0, 0, 0.6);
 }
 
-window.dialog.message.csd.background {
-  border-bottom-left-radius: 12px;
-  border-bottom-right-radius: 12px;
-}
-
 window.dialog.message.csd .dialog-action-area {
   margin-top: -6px;
+  padding: 6px;
 }
 
 window.dialog.message.csd .dialog-action-area > button, window.dialog.message.csd .dialog-action-area > button:first-child, window.dialog.message.csd .dialog-action-area > button:last-child {
-  border-radius: 9999px;
+  border-radius: 6px;
 }
 
 window.dialog.message.csd .dialog-action-area > button:not(:last-child) {
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 64f50eb8..74445ee3 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1782,6 +1782,19 @@ popover.background {
   .view:not(:selected),
   toolbar { background-color: $surface; }
 
+  &.combo {
+    viewport.frame > list {
+      background-color: transparent;
+
+      > row {
+        padding: $space-size $space-size * 2;
+
+        &:first-child { border-radius: $menu-radius $menu-radius 0 0; }
+        &:last-child { border-radius: 0 0 $menu-radius $menu-radius; }
+      }
+    }
+  }
+
   .linked > button:not(.radio) {
     border-radius: $corner-radius;
     &:first-child { border-radius: $corner-radius; }
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 1d987168..4d90950f 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1189,8 +1189,6 @@ searchbar > revealer > box {
     }
   }
 
-  button.toggle { border-radius: $circular-radius; }
-
   stackswitcher { // reset
     margin: $space-size 0;
     border-radius: $circular-radius;
@@ -3064,20 +3062,14 @@ window.dialog.message { // Message Dialog styling
   }
 
   &.csd { // rounded bottom border styling for csd version
-    &.background {
-      // bigger radius for better antialiasing
-      border-bottom-left-radius: $window-radius;
-      border-bottom-right-radius: $window-radius;
-    }
-
     .dialog-action-area {
       margin-top: -$space-size;
-      // padding: $space-size;
+      padding: $space-size;
 
       > button {
         @extend %button-flat;
 
-        &, &:first-child, &:last-child { border-radius: $circular-radius; }
+        &, &:first-child, &:last-child { border-radius: $corner-radius; }
 
         &:not(:last-child) { margin-right: $space-size; }
 
diff --git a/src/sass/gtk/apps/_gnome-3.0.scss b/src/sass/gtk/apps/_gnome-3.0.scss
index 91669d79..aa813554 100644
--- a/src/sass/gtk/apps/_gnome-3.0.scss
+++ b/src/sass/gtk/apps/_gnome-3.0.scss
@@ -343,27 +343,29 @@
 .conflict-row:not(:selected) { background-color: mix($warning, $base, percentage(0.3)); }
 
 // Icon view
-.nautilus-window flowboxchild {
-  // .icon-background { background-color: black; }
+.nautilus-window {
+  flowboxchild {
+    // .icon-background { background-color: black; }
 
-  .icon-item-background {
-    padding: 4px;
-    border-radius: $space-size;
-  }
+    .icon-item-background {
+      padding: 4px;
+      border-radius: $space-size;
+    }
 
-  &:selected {
-    background-color: transparent;
+    &:selected {
+      background-color: transparent;
 
-    .icon-item-background { @extend %selected_items_color; }
+      .icon-item-background { @extend %selected_items_color; }
+    }
   }
-}
 
-.nautilus-window notebook :not(treeview).view {
-  border-radius: $space-size;
+  notebook :not(treeview).view {
+    border-radius: $space-size;
 
-  selection,
-  &:selected {
-    @extend %selected_items_color;
+    selection,
+    &:selected {
+      @extend %selected_items_color;
+    }
   }
 }