Merge branch 'main' into run_dialog_position

Author: fossfreedom

src/panel/settings/settings_style.vala

@@ -154,7 +154,6 @@ namespace Budgie {
 					if (hit) {
 						combobox_gtk.sensitive = true;
 						ui_settings.bind("gtk-theme", combobox_gtk, "active-id", SettingsBindFlags.DEFAULT);
-						combobox_gtk.active_id = ui_settings.get_string("gtk-theme");
 					}
 				}
 				/* Icon themes */ {
@@ -172,7 +171,6 @@ namespace Budgie {
 					if (hit) {
 						combobox_icon.sensitive = true;
 						ui_settings.bind("icon-theme", combobox_icon, "active-id", SettingsBindFlags.DEFAULT);
-						combobox_icon.active_id = ui_settings.get_string("icon-theme");
 					}
 				}
 
@@ -191,7 +189,6 @@ namespace Budgie {
 					if (hit) {
 						combobox_cursor.sensitive = true;
 						ui_settings.bind("cursor-theme", combobox_cursor, "active-id", SettingsBindFlags.DEFAULT);
-						combobox_cursor.active_id = ui_settings.get_string("cursor-theme");
 					}
 				}
 				queue_resize();

src/theme/3.20/theme_hc.scss

@@ -1,5 +1,22 @@
 $variant: 'hc';
 
+// Used to reset all style properties set by the gtk theme
+%reset_style {
+    background: none;
+    box-shadow: none;
+    margin: 0;
+    text-shadow: none;
+    -gtk-icon-shadow: none;
+    -gtk-icon-transform: none;
+    opacity: 1;
+    min-width: 0;
+    min-height: 0;
+    padding: unset;
+    font-size: unset;
+    font-weight: unset;
+}
+
+
 @import 'settings';
 @import '../common/imports';
 @import 'widgets';

src/theme/common/_colors.scss

@@ -1,7 +1,7 @@
 $fg_color: if($variant == "default", white, black);
 
 $selected_bg_color: if($variant == "default", #6bca81, black);
-$selected_fg_color: black;
+$selected_fg_color: if($variant == "default", black, white);
 
 $warning_color: #f27835;
 $error_color: #fc4138;

src/theme/common/_dialogs.scss

@@ -1,5 +1,6 @@
 // Base class for dialogs
 @mixin budgie_dialog() {
+    color: $fg_color;
     background-color: transparent;
     font-weight: normal;
 

src/theme/common/_menu.scss

@@ -7,10 +7,10 @@
     .button:hover { -gtk-#{$image-effect}: none; }
 
     label, #{$search} {
-        color: darken(white, 0.1);
+        color: darken($fg_color, 0.1);
 
         &:disabled {
-            color: transparentize(white, 0.4);
+            color: transparentize($fg_color, 0.4);
         }
     }
 
@@ -48,6 +48,14 @@
         > row {
             padding: 0;
             margin: 0;
+
+            &:focus {
+                image, label {
+                    color: $selected_fg_color;
+                }
+                background-color: $selected_bg_color;
+            }
+
         }
 
         button.flat {
@@ -87,6 +95,7 @@
         .image-button {
             @extend %reset_style;
 
+            color: $fg_color;
             transition-property: background-color;
             transition: 170ms ease-out;
             padding: 4px;
@@ -96,6 +105,12 @@
 
             &:hover { background-color: transparentize(white, 0.9); }
             &:active { background-color: transparentize(white, 0.8); }
+            &:focus {
+                image, label {
+                    color: $selected_fg_color;
+                }
+                background-color: $selected_bg_color;
+            }
         }
 
         .user-icon-button {
@@ -108,6 +123,12 @@
 
             &:hover { background-color: transparentize(white, 0.9); }
             &:active { background-color: transparentize(white, 0.8); }
+            &:focus {
+                image, label {
+                    color: $selected_fg_color;
+                }
+                background-color: $selected_bg_color;
+            }
         }
     }
 
@@ -119,9 +140,17 @@
         margin-bottom: 6px;
         padding: 8px;
 
+        > row:focus {
+            image, label {
+                color: $selected_fg_color;
+            }
+            background-color: $selected_bg_color;
+        }
+
         button {
             @extend %reset_style;
 
+            color: $fg_color;
             transition-property: background-color, color;
             transition: 170ms ease-out;
             padding: 4px 8px 4px 2px;
@@ -160,7 +189,7 @@
         transition: 170ms ease-out;
 
         &:hover { background-color: transparentize(white, 0.9); }
-        &:active, &:checked {
+        &:active, &:checked, &:focus {
             label {
                 color: $selected_fg_color;
             }

src/theme/common/_raven.scss

@@ -31,6 +31,10 @@
     .raven-notifications-view > .raven-background > .frame > list {
         @extend %reset_style;
 
+        .dim-label {
+            color: $fg_color;
+        }
+
         .raven-notifications-group {
             .raven-notifications-group-header {
                 padding: 0 4px;