update

vinceliuice · Dec 12, 2022 · fe3e30f · fe3e30f
1 parent c8c0173
commit fe3e30f
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 14 deletions.
diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss
@@ -1166,6 +1166,7 @@ toolbar {
     box-shadow: $shadow-z4, inset 0 1px highlight($surface);
     background-color: $surface;
     border: none;
+    color: $text;
 
     &:backdrop { box-shadow: $shadow-z2, inset 0 1px highlight($surface); }
 
@@ -3243,8 +3244,8 @@ columnview {
 .app-notification {
   @extend %toolbar_osd;
   margin: $space-size;
-  border-spacing: $space-size;
-  padding: $space-size;
+  border-spacing: 0;
+  padding: 0;
   border: none;
 
   button {
@@ -3253,6 +3254,8 @@ columnview {
     &.text-button:not(:disabled) { color: $primary; }
   }
 
+  > box > label { margin-left: $space-size; }
+
   &.frame,
   border { border: none; }
 }

diff --git a/src/gtk/4.0/gtk-Dark-compact.css b/src/gtk/4.0/gtk-Dark-compact.css
@@ -1453,6 +1453,7 @@ toolbar.osd {
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
   border: none;
+  color: white;
 }
 
 .app-notification:backdrop, .toolbar.osd:backdrop,
@@ -3721,15 +3722,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
  *********************/
 .app-notification {
   margin: 4px;
-  border-spacing: 4px;
-  padding: 4px;
+  border-spacing: 0;
+  padding: 0;
   border: none;
 }
 
 .app-notification button.text-button:not(:disabled) {
   color: #3281EA;
 }
 
+.app-notification > box > label {
+  margin-left: 4px;
+}
+
 .app-notification.frame,
 .app-notification border {
   border: none;

diff --git a/src/gtk/4.0/gtk-Dark.css b/src/gtk/4.0/gtk-Dark.css
@@ -1453,6 +1453,7 @@ toolbar.osd {
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1);
   background-color: #3C3C3C;
   border: none;
+  color: white;
 }
 
 .app-notification:backdrop, .toolbar.osd:backdrop,
@@ -3721,15 +3722,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
  *********************/
 .app-notification {
   margin: 6px;
-  border-spacing: 6px;
-  padding: 6px;
+  border-spacing: 0;
+  padding: 0;
   border: none;
 }
 
 .app-notification button.text-button:not(:disabled) {
   color: #3281EA;
 }
 
+.app-notification > box > label {
+  margin-left: 6px;
+}
+
 .app-notification.frame,
 .app-notification border {
   border: none;

diff --git a/src/gtk/4.0/gtk-Light-compact.css b/src/gtk/4.0/gtk-Light-compact.css
@@ -1453,6 +1453,7 @@ toolbar.osd {
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   border: none;
+  color: rgba(0, 0, 0, 0.87);
 }
 
 .app-notification:backdrop, .toolbar.osd:backdrop,
@@ -3721,15 +3722,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
  *********************/
 .app-notification {
   margin: 4px;
-  border-spacing: 4px;
-  padding: 4px;
+  border-spacing: 0;
+  padding: 0;
   border: none;
 }
 
 .app-notification button.text-button:not(:disabled) {
   color: #1A73E8;
 }
 
+.app-notification > box > label {
+  margin-left: 4px;
+}
+
 .app-notification.frame,
 .app-notification border {
   border: none;

diff --git a/src/gtk/4.0/gtk-Light.css b/src/gtk/4.0/gtk-Light.css
@@ -1453,6 +1453,7 @@ toolbar.osd {
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   border: none;
+  color: rgba(0, 0, 0, 0.87);
 }
 
 .app-notification:backdrop, .toolbar.osd:backdrop,
@@ -3721,15 +3722,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
  *********************/
 .app-notification {
   margin: 6px;
-  border-spacing: 6px;
-  padding: 6px;
+  border-spacing: 0;
+  padding: 0;
   border: none;
 }
 
 .app-notification button.text-button:not(:disabled) {
   color: #1A73E8;
 }
 
+.app-notification > box > label {
+  margin-left: 6px;
+}
+
 .app-notification.frame,
 .app-notification border {
   border: none;

diff --git a/src/gtk/4.0/gtk-compact.css b/src/gtk/4.0/gtk-compact.css
@@ -1453,6 +1453,7 @@ toolbar.osd {
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   border: none;
+  color: rgba(0, 0, 0, 0.87);
 }
 
 .app-notification:backdrop, .toolbar.osd:backdrop,
@@ -3722,15 +3723,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
  *********************/
 .app-notification {
   margin: 4px;
-  border-spacing: 4px;
-  padding: 4px;
+  border-spacing: 0;
+  padding: 0;
   border: none;
 }
 
 .app-notification button.text-button:not(:disabled) {
   color: #1A73E8;
 }
 
+.app-notification > box > label {
+  margin-left: 4px;
+}
+
 .app-notification.frame,
 .app-notification border {
   border: none;

diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css
@@ -1453,6 +1453,7 @@ toolbar.osd {
   box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4);
   background-color: #FFFFFF;
   border: none;
+  color: rgba(0, 0, 0, 0.87);
 }
 
 .app-notification:backdrop, .toolbar.osd:backdrop,
@@ -3722,15 +3723,19 @@ columnview row:not(:selected) cell editablelabel.editing text selection {
  *********************/
 .app-notification {
   margin: 6px;
-  border-spacing: 6px;
-  padding: 6px;
+  border-spacing: 0;
+  padding: 0;
   border: none;
 }
 
 .app-notification button.text-button:not(:disabled) {
   color: #1A73E8;
 }
 
+.app-notification > box > label {
+  margin-left: 6px;
+}
+
 .app-notification.frame,
 .app-notification border {
   border: none;