update

vinceliuice · May 29, 2022 · 35c7cd4 · 35c7cd4
1 parent 03e616d
commit 35c7cd4
Show file tree

Hide file tree

Showing 8 changed files with 248 additions and 76 deletions.
diff --git a/src/_sass/gtk/_common-3.0.scss b/src/_sass/gtk/_common-3.0.scss
@@ -74,10 +74,13 @@ button.gtkstyle-fallback { // For Cinnamon system setting
 
 .view,
 %view {
-  @extend %row_activatable;
   color: $text_color;
   background-color: $base_color;
 
+  &:hover {
+    background-color: if($variant == 'light', rgba(black, 0.08), rgba(white, 0.06));
+  }
+
   &:selected {
     &, &:focus {
       @extend %selected_items;
@@ -1874,15 +1877,15 @@ treeview.view {
     -GtkTreeView-expander-size: 16;
   }
 
-  @extend %row_activatable;
-
   border-left-color: transparentize($fg_color, 0.85);   // this is actually the tree lines color,
   border-top-color: transparentize(black, 0.9);         // while this is the grid lines color, better then nothing
 
   rubberband { @extend rubberband; }                    // to avoid borders being overridden by the previously set props
 
   acceleditor > label { background-color: $selected_bg_color; }
 
+  &:hover { background-image: image($base_color); }
+
   &:selected {
     &, &:focus {
       border-radius: 0;
@@ -3109,7 +3112,7 @@ row {
     &:hover {
       transition: none;
       animation: none;
-      background-color: if($variant == 'light', mix(black, $base_color, 8%), mix(white, $base_color, 6%));
+      background-color: if($variant == 'light', rgba(black, 0.08), rgba(white, 0.06));
     }
 
     &:active, &:checked {
@@ -3242,7 +3245,6 @@ $dialog_bg: if($variant == 'light' and $titlebar == 'dark', $header_bg, $menu_bg
 $dialog_fg: $header_fg;
 
 messagedialog { // Message Dialog styling
-
   &.background {
     background-color: $dialog_bg;
     color: $dialog_fg;
@@ -3289,7 +3291,6 @@ messagedialog { // Message Dialog styling
   }
 
   .dialog-action-area button:not(.suggested-action):not(.destructive-action) {
-
     &:hover {
       background-color: rgba($dialog_fg, 0.06);
     }
@@ -3337,6 +3338,8 @@ messagedialog.background:not(.csd) {
   }
 }
 
+dialog > .dialog-vbox.view { background: none; }
+
 //
 // Sidebar
 //

diff --git a/src/_sass/gtk/_libadwaita.scss b/src/_sass/gtk/_libadwaita.scss
@@ -691,5 +691,51 @@ tabbox:drop(active) {
 }
 
 // Sidebar
-
 .unfolded stacksidebar.sidebar { border: none; }
+
+// preferences
+preferencespage > scrolledwindow > viewport > clamp > box {
+  margin: 24px 12px;
+  border-spacing: 24px;
+}
+
+preferencesgroup > box {
+  &, .labels {
+    border-spacing: 6px;
+  }
+
+  > box.header:not(.single-line) {
+    margin-bottom: 6px;
+  }
+
+  > box.single-line {
+    min-height: $medium_size;
+  }
+
+  button.background-preview-button.toggle {
+    padding: 0;
+    background: none;
+    box-shadow: none;
+    outline-color: transparent;
+    outline-width: 2px;
+    outline-offset: 3px;
+    outline-style: solid;
+    border: none;
+
+    &, > background-preview {
+      border-radius: $bt_radius;
+    }
+
+    &:hover {
+      outline-color: rgba($fg_color, 0.06);
+    }
+
+    &:active {
+      outline-color: rgba($fg_color, 0.2);
+    }
+
+    &:checked {
+      outline-color: $selected_bg_color;
+    }
+  }
+}
diff --git a/src/gtk/theme-3.0/gtk-Dark.css b/src/gtk/theme-3.0/gtk-Dark.css
@@ -85,6 +85,13 @@ textview text {
   background-color: #282A33;
 }
 
+.view:hover,
+window.thunar notebook scrolledwindow.frame.standard-view .view:hover,
+iconview:hover,
+textview text:hover {
+  background-color: rgba(255, 255, 255, 0.06);
+}
+
 textview border {
   background-color: #2d2f38;
 }
@@ -2509,6 +2516,10 @@ treeview.view acceleditor > label {
   background-color: #5294e2;
 }
 
+treeview.view:hover {
+  background-image: image(#282A33);
+}
+
 treeview.view:selected, treeview.view:selected:focus {
   border-radius: 0;
   border-left-color: #a9caf1;
@@ -4162,39 +4173,21 @@ list row {
   padding: 2px;
 }
 
-window.thunar > grid > paned > .sidebar > treeview.has-open-popup.view, .budgie-menu button.has-open-popup, .nemo-window .nemo-places-sidebar .has-open-popup.places-treeview, .has-open-popup.view,
-window.thunar notebook scrolledwindow.frame.standard-view .has-open-popup.view,
-textview text.has-open-popup,
-iconview.has-open-popup, window.thunar > grid > paned > .sidebar > treeview.view:hover, .budgie-menu button:hover, .nemo-window .nemo-places-sidebar .places-treeview:hover, .view:hover,
-window.thunar notebook scrolledwindow.frame.standard-view .view:hover,
-textview text:hover,
-iconview:hover, row.activatable.has-open-popup, row.activatable:hover {
+window.thunar > grid > paned > .sidebar > treeview.has-open-popup.view, .budgie-menu button.has-open-popup, .nemo-window .nemo-places-sidebar .has-open-popup.places-treeview, window.thunar > grid > paned > .sidebar > treeview.view:hover, .budgie-menu button:hover, .nemo-window .nemo-places-sidebar .places-treeview:hover, row.activatable.has-open-popup, row.activatable:hover {
   transition: none;
   animation: none;
-  background-color: #35373f;
+  background-color: rgba(255, 255, 255, 0.06);
 }
 
-window.thunar > grid > paned > .sidebar > treeview.view:active, .budgie-menu button:active, .nemo-window .nemo-places-sidebar .places-treeview:active, .view:active,
-window.thunar notebook scrolledwindow.frame.standard-view .view:active,
-textview text:active,
-iconview:active, window.thunar > grid > paned > .sidebar > treeview.view:checked, .budgie-menu button:checked, .nemo-window .nemo-places-sidebar .places-treeview:checked, .view:checked,
-window.thunar notebook scrolledwindow.frame.standard-view .view:checked,
-textview text:checked,
-iconview:checked, row.activatable:active, row.activatable:checked {
+window.thunar > grid > paned > .sidebar > treeview.view:active, .budgie-menu button:active, .nemo-window .nemo-places-sidebar .places-treeview:active, window.thunar > grid > paned > .sidebar > treeview.view:checked, .budgie-menu button:checked, .nemo-window .nemo-places-sidebar .places-treeview:checked, row.activatable:active, row.activatable:checked {
   transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.thunar > grid > paned > .sidebar > treeview.view:disabled, .budgie-menu button:disabled, .nemo-window .nemo-places-sidebar .places-treeview:disabled, .view:disabled,
-window.thunar notebook scrolledwindow.frame.standard-view .view:disabled,
-textview text:disabled,
-iconview:disabled, row.activatable:disabled {
+window.thunar > grid > paned > .sidebar > treeview.view:disabled, .budgie-menu button:disabled, .nemo-window .nemo-places-sidebar .places-treeview:disabled, row.activatable:disabled {
   color: rgba(230, 235, 239, 0.45);
 }
 
-window.thunar > grid > paned > .sidebar > treeview.view:disabled image, .budgie-menu button:disabled image, .nemo-window .nemo-places-sidebar .places-treeview:disabled image, .view:disabled image,
-window.thunar notebook scrolledwindow.frame.standard-view .view:disabled image,
-textview text:disabled image,
-iconview:disabled image, row.activatable:disabled image {
+window.thunar > grid > paned > .sidebar > treeview.view:disabled image, .budgie-menu button:disabled image, .nemo-window .nemo-places-sidebar .places-treeview:disabled image, row.activatable:disabled image {
   color: inherit;
 }
 
@@ -4394,6 +4387,10 @@ messagedialog.background:not(.csd) .dialog-vbox .dialog-action-box button {
   border-radius: 0;
 }
 
+dialog > .dialog-vbox.view {
+  background: none;
+}
+
 .sidebar {
   border-style: none;
   background-color: #32343D;

diff --git a/src/gtk/theme-3.0/gtk-Light.css b/src/gtk/theme-3.0/gtk-Light.css
@@ -85,6 +85,13 @@ textview text {
   background-color: #ffffff;
 }
 
+.view:hover,
+window.thunar notebook scrolledwindow.frame.standard-view .view:hover,
+iconview:hover,
+textview text:hover {
+  background-color: rgba(0, 0, 0, 0.08);
+}
+
 textview border {
   background-color: #fdfdfe;
 }
@@ -2497,6 +2504,10 @@ treeview.view acceleditor > label {
   background-color: #5294e2;
 }
 
+treeview.view:hover {
+  background-image: image(#ffffff);
+}
+
 treeview.view:selected, treeview.view:selected:focus {
   border-radius: 0;
   border-left-color: #a9caf1;
@@ -4134,39 +4145,21 @@ list row {
   padding: 2px;
 }
 
-window.thunar > grid > paned > .sidebar > treeview.has-open-popup.view, .budgie-menu button.has-open-popup, .nemo-window .nemo-places-sidebar .has-open-popup.places-treeview, .has-open-popup.view,
-window.thunar notebook scrolledwindow.frame.standard-view .has-open-popup.view,
-textview text.has-open-popup,
-iconview.has-open-popup, window.thunar > grid > paned > .sidebar > treeview.view:hover, .budgie-menu button:hover, .nemo-window .nemo-places-sidebar .places-treeview:hover, .view:hover,
-window.thunar notebook scrolledwindow.frame.standard-view .view:hover,
-textview text:hover,
-iconview:hover, row.activatable.has-open-popup, row.activatable:hover {
+window.thunar > grid > paned > .sidebar > treeview.has-open-popup.view, .budgie-menu button.has-open-popup, .nemo-window .nemo-places-sidebar .has-open-popup.places-treeview, window.thunar > grid > paned > .sidebar > treeview.view:hover, .budgie-menu button:hover, .nemo-window .nemo-places-sidebar .places-treeview:hover, row.activatable.has-open-popup, row.activatable:hover {
   transition: none;
   animation: none;
-  background-color: #ebebeb;
+  background-color: rgba(0, 0, 0, 0.08);
 }
 
-window.thunar > grid > paned > .sidebar > treeview.view:active, .budgie-menu button:active, .nemo-window .nemo-places-sidebar .places-treeview:active, .view:active,
-window.thunar notebook scrolledwindow.frame.standard-view .view:active,
-textview text:active,
-iconview:active, window.thunar > grid > paned > .sidebar > treeview.view:checked, .budgie-menu button:checked, .nemo-window .nemo-places-sidebar .places-treeview:checked, .view:checked,
-window.thunar notebook scrolledwindow.frame.standard-view .view:checked,
-textview text:checked,
-iconview:checked, row.activatable:active, row.activatable:checked {
+window.thunar > grid > paned > .sidebar > treeview.view:active, .budgie-menu button:active, .nemo-window .nemo-places-sidebar .places-treeview:active, window.thunar > grid > paned > .sidebar > treeview.view:checked, .budgie-menu button:checked, .nemo-window .nemo-places-sidebar .places-treeview:checked, row.activatable:active, row.activatable:checked {
   transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.thunar > grid > paned > .sidebar > treeview.view:disabled, .budgie-menu button:disabled, .nemo-window .nemo-places-sidebar .places-treeview:disabled, .view:disabled,
-window.thunar notebook scrolledwindow.frame.standard-view .view:disabled,
-textview text:disabled,
-iconview:disabled, row.activatable:disabled {
+window.thunar > grid > paned > .sidebar > treeview.view:disabled, .budgie-menu button:disabled, .nemo-window .nemo-places-sidebar .places-treeview:disabled, row.activatable:disabled {
   color: rgba(70, 72, 83, 0.55);
 }
 
-window.thunar > grid > paned > .sidebar > treeview.view:disabled image, .budgie-menu button:disabled image, .nemo-window .nemo-places-sidebar .places-treeview:disabled image, .view:disabled image,
-window.thunar notebook scrolledwindow.frame.standard-view .view:disabled image,
-textview text:disabled image,
-iconview:disabled image, row.activatable:disabled image {
+window.thunar > grid > paned > .sidebar > treeview.view:disabled image, .budgie-menu button:disabled image, .nemo-window .nemo-places-sidebar .places-treeview:disabled image, row.activatable:disabled image {
   color: inherit;
 }
 
@@ -4366,6 +4359,10 @@ messagedialog.background:not(.csd) .dialog-vbox .dialog-action-box button {
   border-radius: 0;
 }
 
+dialog > .dialog-vbox.view {
+  background: none;
+}
+
 .sidebar {
   border-style: none;
   background-color: #fafbfc;

diff --git a/src/gtk/theme-3.0/gtk.css b/src/gtk/theme-3.0/gtk.css
@@ -85,6 +85,13 @@ textview text {
   background-color: #ffffff;
 }
 
+.view:hover,
+window.thunar notebook scrolledwindow.frame.standard-view .view:hover,
+iconview:hover,
+textview text:hover {
+  background-color: rgba(0, 0, 0, 0.08);
+}
+
 textview border {
   background-color: #fdfdfe;
 }
@@ -2497,6 +2504,10 @@ treeview.view acceleditor > label {
   background-color: #5294e2;
 }
 
+treeview.view:hover {
+  background-image: image(#ffffff);
+}
+
 treeview.view:selected, treeview.view:selected:focus {
   border-radius: 0;
   border-left-color: #a9caf1;
@@ -4150,39 +4161,21 @@ list row {
   padding: 2px;
 }
 
-window.thunar > grid > paned > .sidebar > treeview.has-open-popup.view, .budgie-menu button.has-open-popup, .nemo-window .nemo-places-sidebar .has-open-popup.places-treeview, .has-open-popup.view,
-window.thunar notebook scrolledwindow.frame.standard-view .has-open-popup.view,
-textview text.has-open-popup,
-iconview.has-open-popup, window.thunar > grid > paned > .sidebar > treeview.view:hover, .budgie-menu button:hover, .nemo-window .nemo-places-sidebar .places-treeview:hover, .view:hover,
-window.thunar notebook scrolledwindow.frame.standard-view .view:hover,
-textview text:hover,
-iconview:hover, row.activatable.has-open-popup, row.activatable:hover {
+window.thunar > grid > paned > .sidebar > treeview.has-open-popup.view, .budgie-menu button.has-open-popup, .nemo-window .nemo-places-sidebar .has-open-popup.places-treeview, window.thunar > grid > paned > .sidebar > treeview.view:hover, .budgie-menu button:hover, .nemo-window .nemo-places-sidebar .places-treeview:hover, row.activatable.has-open-popup, row.activatable:hover {
   transition: none;
   animation: none;
-  background-color: #ebebeb;
+  background-color: rgba(0, 0, 0, 0.08);
 }
 
-window.thunar > grid > paned > .sidebar > treeview.view:active, .budgie-menu button:active, .nemo-window .nemo-places-sidebar .places-treeview:active, .view:active,
-window.thunar notebook scrolledwindow.frame.standard-view .view:active,
-textview text:active,
-iconview:active, window.thunar > grid > paned > .sidebar > treeview.view:checked, .budgie-menu button:checked, .nemo-window .nemo-places-sidebar .places-treeview:checked, .view:checked,
-window.thunar notebook scrolledwindow.frame.standard-view .view:checked,
-textview text:checked,
-iconview:checked, row.activatable:active, row.activatable:checked {
+window.thunar > grid > paned > .sidebar > treeview.view:active, .budgie-menu button:active, .nemo-window .nemo-places-sidebar .places-treeview:active, window.thunar > grid > paned > .sidebar > treeview.view:checked, .budgie-menu button:checked, .nemo-window .nemo-places-sidebar .places-treeview:checked, row.activatable:active, row.activatable:checked {
   transition: all 150ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
 }
 
-window.thunar > grid > paned > .sidebar > treeview.view:disabled, .budgie-menu button:disabled, .nemo-window .nemo-places-sidebar .places-treeview:disabled, .view:disabled,
-window.thunar notebook scrolledwindow.frame.standard-view .view:disabled,
-textview text:disabled,
-iconview:disabled, row.activatable:disabled {
+window.thunar > grid > paned > .sidebar > treeview.view:disabled, .budgie-menu button:disabled, .nemo-window .nemo-places-sidebar .places-treeview:disabled, row.activatable:disabled {
   color: rgba(70, 72, 83, 0.55);
 }
 
-window.thunar > grid > paned > .sidebar > treeview.view:disabled image, .budgie-menu button:disabled image, .nemo-window .nemo-places-sidebar .places-treeview:disabled image, .view:disabled image,
-window.thunar notebook scrolledwindow.frame.standard-view .view:disabled image,
-textview text:disabled image,
-iconview:disabled image, row.activatable:disabled image {
+window.thunar > grid > paned > .sidebar > treeview.view:disabled image, .budgie-menu button:disabled image, .nemo-window .nemo-places-sidebar .places-treeview:disabled image, row.activatable:disabled image {
   color: inherit;
 }
 
@@ -4382,6 +4375,10 @@ messagedialog.background:not(.csd) .dialog-vbox .dialog-action-box button {
   border-radius: 0;
 }
 
+dialog > .dialog-vbox.view {
+  background: none;
+}
+
 .sidebar {
   border-style: none;
   background-color: #fafbfc;