From 0c4c9a5f614c21e1c0ba0afd0ccd86942374e8d3 Mon Sep 17 00:00:00 2001
From: Vince <vinceliuice@hotmail.com>
Date: Sun, 31 Dec 2023 18:44:28 +0800
Subject: [PATCH] Fixed issues

---
 src/_sass/gtk/_common-4.0.scss     | 24 +++++++++++++++++-------
 src/_sass/gtk/apps/_gnome-4.0.scss | 12 ++++++++++++
 src/gtk/theme-4.0/gtk-Dark.css     | 30 +++++++++++++++++-------------
 src/gtk/theme-4.0/gtk-Light.css    | 30 +++++++++++++++++-------------
 src/gtk/theme-4.0/gtk.css          | 30 +++++++++++++++++-------------
 5 files changed, 80 insertions(+), 46 deletions(-)

diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss
index 5255522b..143d7bdf 100644
--- a/src/_sass/gtk/_common-4.0.scss
+++ b/src/_sass/gtk/_common-4.0.scss
@@ -604,21 +604,31 @@ button {
 
   // big standalone buttons like in Documents pager
   &.osd {
-    color: $osd_fg_color;
-    background-color: $osd_bg_color;
     border: none;
     box-shadow: none;
-    background-clip: border-box;
+    background-color: rgba(black, 0.65);
+    color: white;
 
     &.image-button {
-      padding: $cont_padding;
+      padding: $cont_padding / 2;
       min-height: $medium_size;
       min-width: $medium_size;
     }
 
-    &:hover { color: $selected_bg_color; }
-    &:active, &:checked, &.keyboard-activating { @include button(osd-active); }
-    &:disabled { @include button(osd-insensitive); }
+    &:hover {
+      background-color: rgba(black, 0.75);
+      color: white;
+    }
+
+    &:active, &:checked, &.keyboard-activating {
+      background-color: rgba(black, 0.85);
+      color: white;
+    }
+
+    &:disabled {
+      background-color: rgba(black, 0.35);
+      color: rgba(white, 0.45);
+    }
   }
 
   //overlay / OSD style
diff --git a/src/_sass/gtk/apps/_gnome-4.0.scss b/src/_sass/gtk/apps/_gnome-4.0.scss
index 5f619a11..ed1e6e24 100644
--- a/src/_sass/gtk/apps/_gnome-4.0.scss
+++ b/src/_sass/gtk/apps/_gnome-4.0.scss
@@ -508,6 +508,18 @@ window.dialog {
   }
 }
 
+.background-thumbnail {
+  button.osd.remove-button {
+    padding: 0;
+  }
+}
+
+navigation-view-page > toolbarview > scrolledwindow > viewport > clamp > box > box > stack {
+  > button {
+    margin-top: 12px;
+  }
+}
+
 //
 // Calculator
 //
diff --git a/src/gtk/theme-4.0/gtk-Dark.css b/src/gtk/theme-4.0/gtk-Dark.css
index 7b83be52..fd894d52 100644
--- a/src/gtk/theme-4.0/gtk-Dark.css
+++ b/src/gtk/theme-4.0/gtk-Dark.css
@@ -728,35 +728,31 @@ button:drop(active) {
 }
 
 button.osd {
-  color: #D3DAE3;
-  background-color: #282A33;
   border: none;
   box-shadow: none;
-  background-clip: border-box;
+  background-color: rgba(0, 0, 0, 0.65);
+  color: white;
 }
 
 button.osd.image-button {
-  padding: 6px;
+  padding: 3px;
   min-height: 28px;
   min-width: 28px;
 }
 
 button.osd:hover {
-  color: #5294e2;
+  background-color: rgba(0, 0, 0, 0.75);
+  color: white;
 }
 
 button.osd:active, button.osd:checked, button.osd.keyboard-activating {
-  color: #ffffff;
-  border-color: #5294e2;
-  background-color: #5294e2;
-  background-clip: border-box;
+  background-color: rgba(0, 0, 0, 0.85);
+  color: white;
 }
 
 button.osd:disabled {
-  opacity: 1;
-  color: #5b5f68;
-  border-color: #434655;
-  background-color: rgba(51, 54, 65, 0.85);
+  background-color: rgba(0, 0, 0, 0.35);
+  color: rgba(255, 255, 255, 0.45);
 }
 
 .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
@@ -6068,6 +6064,14 @@ window.dialog > box > stack > box > box > notebook.frame {
   border-radius: 0;
 }
 
+.background-thumbnail button.osd.remove-button {
+  padding: 0;
+}
+
+navigation-view-page > toolbarview > scrolledwindow > viewport > clamp > box > box > stack > button {
+  margin-top: 12px;
+}
+
 .history-view {
   background-color: #32343D;
 }
diff --git a/src/gtk/theme-4.0/gtk-Light.css b/src/gtk/theme-4.0/gtk-Light.css
index 53a833a2..3f6ba983 100644
--- a/src/gtk/theme-4.0/gtk-Light.css
+++ b/src/gtk/theme-4.0/gtk-Light.css
@@ -728,35 +728,31 @@ button:drop(active) {
 }
 
 button.osd {
-  color: #D3DAE3;
-  background-color: #282A33;
   border: none;
   box-shadow: none;
-  background-clip: border-box;
+  background-color: rgba(0, 0, 0, 0.65);
+  color: white;
 }
 
 button.osd.image-button {
-  padding: 6px;
+  padding: 3px;
   min-height: 28px;
   min-width: 28px;
 }
 
 button.osd:hover {
-  color: #5294e2;
+  background-color: rgba(0, 0, 0, 0.75);
+  color: white;
 }
 
 button.osd:active, button.osd:checked, button.osd.keyboard-activating {
-  color: #ffffff;
-  border-color: #5294e2;
-  background-color: #5294e2;
-  background-clip: border-box;
+  background-color: rgba(0, 0, 0, 0.85);
+  color: white;
 }
 
 button.osd:disabled {
-  opacity: 1;
-  color: #5b5f68;
-  border-color: #434655;
-  background-color: rgba(51, 54, 65, 0.85);
+  background-color: rgba(0, 0, 0, 0.35);
+  color: rgba(255, 255, 255, 0.45);
 }
 
 .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
@@ -6064,6 +6060,14 @@ window.dialog > box > stack > box > box > notebook.frame {
   border-radius: 0;
 }
 
+.background-thumbnail button.osd.remove-button {
+  padding: 0;
+}
+
+navigation-view-page > toolbarview > scrolledwindow > viewport > clamp > box > box > stack > button {
+  margin-top: 12px;
+}
+
 .history-view {
   background-color: #fafbfc;
 }
diff --git a/src/gtk/theme-4.0/gtk.css b/src/gtk/theme-4.0/gtk.css
index a6103639..9f2b1141 100644
--- a/src/gtk/theme-4.0/gtk.css
+++ b/src/gtk/theme-4.0/gtk.css
@@ -728,35 +728,31 @@ button:drop(active) {
 }
 
 button.osd {
-  color: #D3DAE3;
-  background-color: #282A33;
   border: none;
   box-shadow: none;
-  background-clip: border-box;
+  background-color: rgba(0, 0, 0, 0.65);
+  color: white;
 }
 
 button.osd.image-button {
-  padding: 6px;
+  padding: 3px;
   min-height: 28px;
   min-width: 28px;
 }
 
 button.osd:hover {
-  color: #5294e2;
+  background-color: rgba(0, 0, 0, 0.75);
+  color: white;
 }
 
 button.osd:active, button.osd:checked, button.osd.keyboard-activating {
-  color: #ffffff;
-  border-color: #5294e2;
-  background-color: #5294e2;
-  background-clip: border-box;
+  background-color: rgba(0, 0, 0, 0.85);
+  color: white;
 }
 
 button.osd:disabled {
-  opacity: 1;
-  color: #5b5f68;
-  border-color: #434655;
-  background-color: rgba(51, 54, 65, 0.85);
+  background-color: rgba(0, 0, 0, 0.35);
+  color: rgba(255, 255, 255, 0.45);
 }
 
 .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child), .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
@@ -6110,6 +6106,14 @@ window.dialog > box > stack > box > box > notebook.frame {
   border-radius: 0;
 }
 
+.background-thumbnail button.osd.remove-button {
+  padding: 0;
+}
+
+navigation-view-page > toolbarview > scrolledwindow > viewport > clamp > box > box > stack > button {
+  margin-top: 12px;
+}
+
 .history-view {
   background-color: #fafbfc;
 }