[libadwaita/wip/exalm/stylesheet-cleanups: 10/13] stylesheet: Rename menu_* colors to view_*




commit 7f5206bd7ba306cbc391994655f19670ae4c59d4
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Fri May 21 14:31:21 2021 +0500

    stylesheet: Rename menu_* colors to view_*
    
    They are used in many more places than menus now, so this would be more
    appropriate.

 src/stylesheet/_colors.scss                |  8 ++++----
 src/stylesheet/widgets/_emoji-chooser.scss | 16 ++++++++--------
 src/stylesheet/widgets/_lists.scss         | 10 +++++-----
 src/stylesheet/widgets/_menus.scss         | 12 ++++++------
 src/stylesheet/widgets/_misc.scss          |  2 +-
 src/stylesheet/widgets/_trees.scss         |  2 +-
 src/stylesheet/widgets/_views.scss         |  6 +++---
 7 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss
index 1c974dc3..d72cf90f 100644
--- a/src/stylesheet/_colors.scss
+++ b/src/stylesheet/_colors.scss
@@ -17,10 +17,10 @@ $link_visited_color: if($variant == 'light', darken($selected_bg_color, 20%), li
 $dark_fill: mix($borders_color, $bg_color, 50%);
 $headerbar_bg_color: if($variant == 'light', lighten($bg_color, 5%), darken($bg_color, 3%));
 $menu_color: $base_color;
-$menu_hover_color: transparentize($text_color, .93);
-$menu_selected_color: transparentize($text_color, .9);
-$menu_selected_hover_color: transparentize($text_color, .87);
-$menu_active_color: transparentize(black, .85);
+$view_hover_color: transparentize($text_color, .93);
+$view_selected_color: transparentize($text_color, .9);
+$view_selected_hover_color: transparentize($text_color, .87);
+$view_active_color: transparentize(black, .85);
 
 $scrollbar_bg_color: if($variant == 'light', mix($bg_color, $fg_color, 80%), mix($base_color, $bg_color, 
50%));
 $scrollbar_slider_color: mix($fg_color, $bg_color, 60%);
diff --git a/src/stylesheet/widgets/_emoji-chooser.scss b/src/stylesheet/widgets/_emoji-chooser.scss
index f5ae1736..ffc5f02a 100644
--- a/src/stylesheet/widgets/_emoji-chooser.scss
+++ b/src/stylesheet/widgets/_emoji-chooser.scss
@@ -24,19 +24,19 @@ button.emoji-section {
   transition: none;
 
   &:hover {
-    background: $menu_hover_color;
+    background: $view_hover_color;
   }
 
   &:checked {
-    background: $menu_selected_color;
+    background: $view_selected_color;
 
     &:hover {
-      background: $menu_selected_hover_color;
+      background: $view_selected_hover_color;
     }
   }
 
   &:hover:active {
-    background: $menu_active_color;
+    background: $view_active_color;
   }
 }
 
@@ -47,10 +47,10 @@ popover.emoji-picker emoji {
 
   &:focus,
   &:hover {
-    background: $menu_selected_color;
+    background: $view_selected_color;
 
     &:active {
-      background: $menu_active_color;
+      background: $view_active_color;
     }
   }
 }
@@ -77,11 +77,11 @@ emoji-completion-row {
 
   &:focus,
   &:hover {
-    background-color: $menu_selected_color;
+    background-color: $view_selected_color;
     color: $text-color;
 
     &:active {
-      background-color: $menu_active_color; // matching buttons
+      background-color: $view_active_color; // matching buttons
     }
   }
 }
diff --git a/src/stylesheet/widgets/_lists.scss b/src/stylesheet/widgets/_lists.scss
index 7bcf2a85..d1f9ac55 100644
--- a/src/stylesheet/widgets/_lists.scss
+++ b/src/stylesheet/widgets/_lists.scss
@@ -23,20 +23,20 @@ row {
 
   &.activatable {
     &.has-open-popup, // this is for indicathing which row generated a popover see 
https://bugzilla.gnome.org/show_bug.cgi?id=754411
-    &:hover { background-color: $menu_hover_color; }
+    &:hover { background-color: $view_hover_color; }
 
-    &:active { background-color: $menu_active_color; }
+    &:active { background-color: $view_active_color; }
 
     &:selected {
       &.has-open-popup,
-      &:hover { background-color: $menu_selected_hover_color; }
+      &:hover { background-color: $view_selected_hover_color; }
 
-      &:active { background-color: $menu_active_color; }
+      &:active { background-color: $view_active_color; }
     }
   }
 
   &:selected {
-    background-color: $menu_selected_color;
+    background-color: $view_selected_color;
   }
 
   &:disabled { color: gtkalpha(currentColor, .55); }
diff --git a/src/stylesheet/widgets/_menus.scss b/src/stylesheet/widgets/_menus.scss
index 4eef1d32..1b7ac882 100644
--- a/src/stylesheet/widgets/_menus.scss
+++ b/src/stylesheet/widgets/_menus.scss
@@ -14,7 +14,7 @@ popover.menu {
       outline: none;
       transition: none;
 
-      &:selected { background: image($menu_selected_color); }
+      &:selected { background: image($view_selected_color); }
     }
   }
 
@@ -26,8 +26,8 @@ popover.menu {
 
       padding: 11px;
       &:focus {
-         background-color: $menu_selected_color;
-         border-color: $menu_selected_color;
+         background-color: $view_selected_color;
+         border-color: $view_selected_color;
       }
     }
   }
@@ -90,10 +90,10 @@ popover.menu {
     &:hover,
     &:selected {
       color: $text-color;
-      background-color: $menu_selected_color;
+      background-color: $view_selected_color;
 
       &:active {
-        background-color: $menu_active_color; // matching buttons
+        background-color: $view_active_color; // matching buttons
       }
     }
 
@@ -133,7 +133,7 @@ menubar {
     border-radius: $button_radius;
 
     &:selected { //Seems like it :hover even with keyboard focus
-      background-color: $menu_selected_color;
+      background-color: $view_selected_color;
     }
 
     &:disabled {
diff --git a/src/stylesheet/widgets/_misc.scss b/src/stylesheet/widgets/_misc.scss
index c9664b66..176b633c 100644
--- a/src/stylesheet/widgets/_misc.scss
+++ b/src/stylesheet/widgets/_misc.scss
@@ -114,7 +114,7 @@ window.assistant {
   .sidebar > label { padding: 6px 12px; }
 
   .sidebar > label.highlight {
-    background-color: $menu_selected_color;
+    background-color: $view_selected_color;
     border-radius: $menu-margin;
   }
 }
diff --git a/src/stylesheet/widgets/_trees.scss b/src/stylesheet/widgets/_trees.scss
index d85a5f9f..38a47923 100644
--- a/src/stylesheet/widgets/_trees.scss
+++ b/src/stylesheet/widgets/_trees.scss
@@ -1,5 +1,5 @@
 // To be used for opaque elements overlaid atop the selected row
-$treeview_selection_opaque: mix(opacify($menu_selected_color, 1), $base_color, 100% * 
alpha($menu_selected_color));
+$treeview_selection_opaque: mix(opacify($view_selected_color, 1), $base_color, 100% * 
alpha($view_selected_color));
 
 columnview.view,
 treeview.view {
diff --git a/src/stylesheet/widgets/_views.scss b/src/stylesheet/widgets/_views.scss
index 985b44ac..d5ceff5b 100644
--- a/src/stylesheet/widgets/_views.scss
+++ b/src/stylesheet/widgets/_views.scss
@@ -10,7 +10,7 @@
 
   &:selected {
     &:focus, & {
-      background-color: $menu_selected_color;
+      background-color: $view_selected_color;
 
       border-radius: 3px;
     }
@@ -60,7 +60,7 @@ flowbox {
     @include focus-ring();
 
     &:selected {
-      background-color: $menu_selected_color;
+      background-color: $view_selected_color;
     }
   }
 }
@@ -73,7 +73,7 @@ gridview {
     @include focus-ring();
 
     &:selected {
-      background-color: $menu_selected_color;
+      background-color: $view_selected_color;
     }
 
     box { //cells


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]