IMprovement: GTK3&4 - osd colors & xfce shutdown dialog

thekomer · Feb 24, 2022 · 2397227 · 2397227
1 parent f6c5798
commit 2397227
Show file tree

Hide file tree

Showing 9 changed files with 605 additions and 455 deletions.
diff --git a/gtk-3.0/_colors.scss b/gtk-3.0/_colors.scss
@@ -71,11 +71,10 @@ $window_border_backdrop_color: mix($headerbar_color, $fg_color, 92%);
 $tooltip_borders_color: mix($headerbar_color, $fg_color, 92%);
 
 $osd_fg_color: #fefefe;
-$osd_text_color: white;
-$osd_bg_color:  transparentize(#14171a, 0.2);
+$osd_bg_color:  transparentize($headerbar_color, 0.2);
 $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);
 $osd_insensitive_fg_color: mix($osd_fg_color, opacify($osd_bg_color, 1), 50%);
-$osd_borders_color: transparentize(black, 0.85);
+$osd_borders_color: transparentize(white, 0.9);
 
 $base_hover_color: transparentize($fg_color, 0.95);
 

diff --git a/gtk-3.0/_drawing.scss b/gtk-3.0/_drawing.scss
@@ -96,15 +96,15 @@
     box-shadow: $_blank_edge;
   }
   @if $t==osd {
-    color: $osd_text_color;
+    color: $osd_fg_color;
     border-color: $osd_borders_color;
     background-color: transparentize(opacify($osd_borders_color, 1), 0.5);
     box-shadow: none;
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black;
   }
   @if $t==osd-focus {
-    color: $osd_text_color;
+    color: $osd_fg_color;
     border-color: $selected_bg_color;
     background-color: transparentize(opacify($osd_borders_color, 1), 0.5);
     background-clip: padding-box;
@@ -121,7 +121,7 @@
     -gtk-icon-shadow: none;
   }
   @if $t==osd-backdrop {
-    color: $osd_text_color;
+    color: $osd_fg_color;
     border-color: $osd_borders_color;
     background-color: transparentize(opacify($osd_borders_color, 1), 0.5);
     background-clip: padding-box;
@@ -350,9 +350,10 @@
 		//
 		// normal osd button
 		//
-    $_bg: if($c!=$base_color, transparentize($c, 0.5), $osd_bg_color);
+    $_bg: if($c!=$base_color, transparentize($c, 0.5), $base_color);
     color: $osd_fg_color;
     border-color: $osd_borders_color;
+    border: 2px solid $osd_borders_color;
     background-color: $_bg;
     background-clip: padding-box;
     box-shadow: inset 0 1px transparentize(white, 0.9);
@@ -365,7 +366,8 @@
 		//
     $_bg: if($c!=$base_color, transparentize($c, 0.3),	lighten($osd_bg_color, 12%));
     color: white;
-    border-color: $osd_borders_color;
+    //border-color: $osd_borders_color;
+    border: 2px solid transparentize($theme_color, 0.6);
     background-image: linear-gradient(to bottom, $_bg, $_bg);
     background-clip: padding-box;
     box-shadow: inset 0 1px transparentize(white, 0.9);

diff --git a/gtk-3.0/apps/_xfce.scss b/gtk-3.0/apps/_xfce.scss
@@ -308,16 +308,19 @@ window.thunar statusbar {
  * **************/
 
 .xfsm-logout-dialog {
+	background-color: $osd_bg_color;
+	color: $osd_fg_color;
+	border: 1px solid $osd_borders_color;
 	border-radius: 0.4em;
 	button {
+		@include button(osd);
 		border-radius: 0.4em;
 		margin: 0.5em;
 		&:hover {
-			//background-color: lighten($panel_bg_color, 10%);
-			background: linear-gradient(to right, transparentize($theme-gradient-start, 0.4), transparentize($theme-gradient-end,0.4));
+			@include button(osd-hover);
 		}
 		&:active, &:checked {
-			background: linear-gradient(to right, transparentize($theme-gradient-start, 0.2), transparentize($theme-gradient-end,0.2));
+			@include button(osd-active);
 			label, image { color: inherit; }
 		}
 	}