GNOME.org
 

[libadwaita/wip/exalm/accent: 1/13] stylesheet: Rename selected_bg/fg_color to accent_color/text


commit f543794a43a896b007a4474485eac6b879718618
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Fri Jun 11 21:12:39 2021 +0500

    stylesheet: Rename selected_bg/fg_color to accent_color/text
    
    That better reflects how it's used.

 src/stylesheet/_colors-public.scss          |  4 ++--
 src/stylesheet/_colors.scss                 | 28 ++++++++++++++--------------
 src/stylesheet/_common.scss                 |  2 +-
 src/stylesheet/_drawing.scss                |  2 +-
 src/stylesheet/widgets/_buttons.scss        |  6 +++---
 src/stylesheet/widgets/_calendar.scss       |  6 +++---
 src/stylesheet/widgets/_entries.scss        |  6 +++---
 src/stylesheet/widgets/_header-bar.scss     |  4 ++--
 src/stylesheet/widgets/_lists.scss          |  2 +-
 src/stylesheet/widgets/_notebook.scss       |  8 ++++----
 src/stylesheet/widgets/_paned.scss          |  2 +-
 src/stylesheet/widgets/_sidebars.scss       |  2 +-
 src/stylesheet/widgets/_tab-view.scss       | 10 +++++-----
 src/stylesheet/widgets/_text-selection.scss |  2 +-
 src/stylesheet/widgets/_toolbars.scss       |  4 ++--
 src/stylesheet/widgets/_trees.scss          |  8 ++++----
 src/stylesheet/widgets/_views.scss          |  4 ++--
 17 files changed, 50 insertions(+), 50 deletions(-)
---
diff --git a/src/stylesheet/_colors-public.scss b/src/stylesheet/_colors-public.scss
index 61ca0138..9472eedc 100644
--- a/src/stylesheet/_colors-public.scss
+++ b/src/stylesheet/_colors-public.scss
@@ -23,11 +23,11 @@ text widgets and the like base background color */
 
 /*
 base background color of selections */
-@define-color theme_selected_bg_color #{"" +$selected_bg_color};
+@define-color theme_selected_bg_color #{"" +$accent_color};
 
 /*
 text/foreground color of selections */
-@define-color theme_selected_fg_color #{"" +$selected_fg_color};
+@define-color theme_selected_fg_color #{"" +$accent_text};
 
 /*
 base background color of insensitive widgets */
diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss
index c873ece1..e6609801 100644
--- a/src/stylesheet/_colors.scss
+++ b/src/stylesheet/_colors.scss
@@ -6,14 +6,14 @@ $text_color: if($variant == 'light', black, white);
 $bg_color: if($variant == 'light', #f6f5f4, darken(desaturate(#3d3846, 100%), 4%));
 $fg_color: if($variant == 'light', #2e3436, #eeeeec);
 
-$selected_fg_color: #ffffff;
-$selected_bg_color: if($variant == 'light', #3584e4, #62a0ea);
-$selected_borders_color: darken($selected_bg_color, 15%);
+$accent_text: #ffffff;
+$accent_color: if($variant == 'light', #3584e4, #62a0ea);
+$selected_borders_color: darken($accent_color, 15%);
 $borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
 $alt_borders_color: if($variant == 'light', darken($bg_color, 24%), darken($bg_color, 18%));
 $borders_edge: if($variant == 'light', transparentize(white, 0.2), transparentize($fg_color, 0.93));
-$link_color:darken($selected_bg_color, 10%);
-$link_visited_color: darken($selected_bg_color, 20%);
+$link_color:darken($accent_color, 10%);
+$link_visited_color: darken($accent_color, 20%);
 $dark_fill: mix($borders_color, $bg_color, 50%);
 $headerbar_bg_color: $bg_color;
 $menu_color: $base_color;
@@ -35,10 +35,10 @@ $button_checked_color: #{"alpha(currentColor, .2)"};
 $button_checked_hover_color: #{"alpha(currentColor, .25)"};
 $button_checked_active_color: #{"alpha(currentColor, .35)"};
 
-$fill_color: $selected_bg_color;
-$fill_text_color: $selected_fg_color;
-$fill_hover_color: mix($selected_bg_color, $text_color, 90%);
-$fill_active_color: mix($selected_bg_color, $text_color, 80%);
+$fill_color: $accent_color;
+$fill_text_color: $accent_text;
+$fill_hover_color: mix($accent_color, $text_color, 90%);
+$fill_active_color: mix($accent_color, $text_color, 80%);
 
 $slider_color: mix(white, $base_color, 80%);
 $slider_hover_color: white;
@@ -46,12 +46,12 @@ $slider_hover_color: white;
 $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%);
 $scrollbar_slider_hover_color: mix($fg_color, $bg_color, 80%);
-$scrollbar_slider_active_color: darken($selected_bg_color, 10%);
+$scrollbar_slider_active_color: darken($accent_color, 10%);
 
 $warning_color: #e5a50a;
 $error_color: #e01b24;
 $success_color: if($variant == 'light', #33d17a, darken(#33d17a, 10%));
-$suggested_color: $selected_bg_color;
+$suggested_color: $accent_color;
 $destructive_color: if($variant == 'light', $error_color, darken($error_color, 10%));
 
 $osd_fg_color: #eeeeec;
@@ -74,7 +74,7 @@ $insensitive_bg_color: mix($bg_color, $base_color, 60%);
 $insensitive_borders_color: mix($borders_color, $bg_color, 80%);
 
 //special cased widget colors
-$focus_border_color:  transparentize($selected_bg_color, 0.5);
+$focus_border_color:  transparentize($accent_color, 0.5);
 $alt_focus_border_color: if($variant == 'light', transparentize(white, 0.2), transparentize(white,0.7));
 $dim_label_opacity: 0.55;
 
@@ -83,7 +83,7 @@ $dim_label_opacity: 0.55;
 
   $fg_color: if($variant == 'light', darken($fg_color, 3%), lighten($fg_color, 2%));
   $bg_color: if($variant == 'light', lighten($bg_color, 3%), darken($bg_color, 2%));
-  $selected_bg_color: darken($selected_bg_color,10%);
+  $accent_color: darken($accent_color, 10%);
   $selected_borders_color: darken($selected_borders_color, 10%);
   $borders_color: if($variant == 'light', darken($borders_color, 30%), lighten($borders_color, 30%));
   $alt_borders_color: if($variant == 'light', darken($alt_borders_color, 33%), lighten($alt_borders_color, 
28%));
@@ -94,7 +94,7 @@ $dim_label_opacity: 0.55;
   $insensitive_borders_color: mix($borders_color, $bg_color, 80%);
 
   //focus rings
-  $focus_border_color: transparentize($selected_bg_color, 0.2);
+  $focus_border_color: transparentize($accent_color, 0.2);
   $alt_focus_border_color: if($variant == 'light', white, transparentize(white,0.4));
 
   $dim_label_opacity: 0.9;
diff --git a/src/stylesheet/_common.scss b/src/stylesheet/_common.scss
index e7072a3e..a88853bf 100644
--- a/src/stylesheet/_common.scss
+++ b/src/stylesheet/_common.scss
@@ -47,7 +47,7 @@ selection {
   color: transparent;
 
   &:focus-within {
-    background-color: transparentize($selected_bg_color, 0.7);
+    background-color: transparentize($accent_color, 0.7);
   }
 }
 
diff --git a/src/stylesheet/_drawing.scss b/src/stylesheet/_drawing.scss
index 09786bb8..40a71cc7 100644
--- a/src/stylesheet/_drawing.scss
+++ b/src/stylesheet/_drawing.scss
@@ -71,7 +71,7 @@
   }
   @if $t==osd-focus {
     color: $osd_text_color;
-    border-color: $selected_bg_color;
+    border-color: $accent_color;
     background-color: transparentize(opacify($osd_borders_color, 1), 0.5);
     background-clip: padding-box;
   }
diff --git a/src/stylesheet/widgets/_buttons.scss b/src/stylesheet/widgets/_buttons.scss
index 8a6e2268..64149e8d 100644
--- a/src/stylesheet/widgets/_buttons.scss
+++ b/src/stylesheet/widgets/_buttons.scss
@@ -1,7 +1,7 @@
 // stuff for .needs-attention
 @keyframes needs_attention {
-  from { background-image: radial-gradient(farthest-side, $selected_bg_color 0%, 
transparentize($selected_bg_color, 1) 0%); }
-  to { background-image: radial-gradient(farthest-side, $selected_bg_color 95%, 
transparentize($selected_bg_color, 1)); }
+  from { background-image: radial-gradient(farthest-side, $accent_color 0%, transparentize($accent_color, 1) 
0%); }
+  to { background-image: radial-gradient(farthest-side, $accent_color 95%, transparentize($accent_color, 
1)); }
 }
 
 %button,
@@ -255,7 +255,7 @@ button {
   // simulates the shadow labels and icons normally have in buttons.
   animation: needs_attention 150ms ease-in;
 
-  background-image: radial-gradient(farthest-side, $selected_bg_color 96%, 
transparentize($selected_bg_color, 1));
+  background-image: radial-gradient(farthest-side, $accent_color 96%, transparentize($accent_color, 1));
   background-size: 6px 6px, 6px 6px;
   background-repeat: no-repeat;
 
diff --git a/src/stylesheet/widgets/_calendar.scss b/src/stylesheet/widgets/_calendar.scss
index 7fce9169..a9ad0a92 100644
--- a/src/stylesheet/widgets/_calendar.scss
+++ b/src/stylesheet/widgets/_calendar.scss
@@ -29,10 +29,10 @@ calendar {
         &:selected {
           border-radius: 3px;
 
-          background-color: $selected_bg_color;
-          color: $selected_fg_color;
+          background-color: $accent_color;
+          color: $accent_text;
 
-          &:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); }
+          &:disabled { color: mix($accent_text, $accent_color, 50%); }
         }
       }
 
diff --git a/src/stylesheet/widgets/_entries.scss b/src/stylesheet/widgets/_entries.scss
index 095de974..c5ecd198 100644
--- a/src/stylesheet/widgets/_entries.scss
+++ b/src/stylesheet/widgets/_entries.scss
@@ -56,7 +56,7 @@ entry {
 
       &:hover { color: $fg_color; }
 
-      &:active { color: $selected_bg_color; }
+      &:active { color: $accent_color; }
 
       &.left { margin-right: 6px; }
       &.right { margin-left: 6px; }
@@ -90,7 +90,7 @@ entry {
       background-image: none;
       border-radius: 0;
       border-width: 0 0 2px;
-      border-color: $selected_bg_color;
+      border-color: $accent_color;
       border-style: solid;
       box-shadow: none;
     }
@@ -110,6 +110,6 @@ treeview entry {
     background-image: none;
     background-color: $base_color;
 
-    &:focus-within { border-color: $selected_bg_color; }
+    &:focus-within { border-color: $accent_color; }
   }
 }
diff --git a/src/stylesheet/widgets/_header-bar.scss b/src/stylesheet/widgets/_header-bar.scss
index d4d614e1..ba622684 100644
--- a/src/stylesheet/widgets/_header-bar.scss
+++ b/src/stylesheet/widgets/_header-bar.scss
@@ -128,11 +128,11 @@ windowtitle {
 window.devel {
   headerbar {
     $gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px 
no-repeat,
-               linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.8));
+               linear-gradient(to right, transparent 65%, transparentize($accent_color, 0.8));
 
     @if $variant == 'dark' {
       $gradient: cross-fade(10% -gtk-icontheme("system-run-symbolic"), image(transparent)) 90% 0/256px 256px 
no-repeat,
-                 linear-gradient(to right, transparent 65%, transparentize($selected_bg_color, 0.9));
+                 linear-gradient(to right, transparent 65%, transparentize($accent_color, 0.9));
     }
 
     background: $headerbar_bg_color $gradient;
diff --git a/src/stylesheet/widgets/_lists.scss b/src/stylesheet/widgets/_lists.scss
index 15dabb6e..6fcbd092 100644
--- a/src/stylesheet/widgets/_lists.scss
+++ b/src/stylesheet/widgets/_lists.scss
@@ -172,7 +172,7 @@ row.expander {
   }
 
   &:checked image.expander-row-arrow:not(:disabled) {
-    color: $selected_bg_color;
+    color: $accent_color;
   }
 
   & image.expander-row-arrow:disabled {
diff --git a/src/stylesheet/widgets/_notebook.scss b/src/stylesheet/widgets/_notebook.scss
index eb262fd5..c57bf320 100644
--- a/src/stylesheet/widgets/_notebook.scss
+++ b/src/stylesheet/widgets/_notebook.scss
@@ -17,7 +17,7 @@ notebook {
           &:hover { box-shadow: inset 0 -4px $borders_color; }
 
 
-          &:checked { box-shadow: inset 0 -4px $selected_bg_color; }
+          &:checked { box-shadow: inset 0 -4px $accent_color; }
         }
       }
     }
@@ -29,7 +29,7 @@ notebook {
         > tab {
           &:hover { box-shadow: inset 0 4px $borders_color; }
 
-          &:checked { box-shadow: inset 0 4px $selected_bg_color; }
+          &:checked { box-shadow: inset 0 4px $accent_color; }
         }
       }
     }
@@ -41,7 +41,7 @@ notebook {
         > tab {
           &:hover { box-shadow: inset -4px 0 $borders_color; }
 
-          &:checked { box-shadow: inset -4px 0 $selected_bg_color; }
+          &:checked { box-shadow: inset -4px 0 $accent_color; }
         }
       }
     }
@@ -53,7 +53,7 @@ notebook {
         > tab {
           &:hover { box-shadow: inset 4px 0 $borders_color; }
 
-          &:checked { box-shadow: inset 4px 0 $selected_bg_color; }
+          &:checked { box-shadow: inset 4px 0 $accent_color; }
         }
       }
     }
diff --git a/src/stylesheet/widgets/_paned.scss b/src/stylesheet/widgets/_paned.scss
index 09f2681f..0ef6af62 100644
--- a/src/stylesheet/widgets/_paned.scss
+++ b/src/stylesheet/widgets/_paned.scss
@@ -9,7 +9,7 @@ paned {
     background-image: image($borders_color);
     background-size: 1px 1px;
 
-    &:selected { background-image: image($selected_bg_color); } // FIXME is this needed?
+    &:selected { background-image: image($accent_color); } // FIXME is this needed?
 
     &.wide {
       min-width: 5px;
diff --git a/src/stylesheet/widgets/_sidebars.scss b/src/stylesheet/widgets/_sidebars.scss
index f0f0b45f..8a0481f8 100644
--- a/src/stylesheet/widgets/_sidebars.scss
+++ b/src/stylesheet/widgets/_sidebars.scss
@@ -114,7 +114,7 @@ placessidebar {
       background-clip: content-box;
     }
 
-    &.sidebar-new-bookmark-row { color: $selected_bg_color; }
+    &.sidebar-new-bookmark-row { color: $accent_color; }
 
     &:drop(active):not(:disabled) {
       color: $drop_target_color;
diff --git a/src/stylesheet/widgets/_tab-view.scss b/src/stylesheet/widgets/_tab-view.scss
index 39bdd216..2732e881 100644
--- a/src/stylesheet/widgets/_tab-view.scss
+++ b/src/stylesheet/widgets/_tab-view.scss
@@ -15,9 +15,9 @@ $tab_bg: darken($headerbar_bg_color, 6%);
 
 @mixin need-attention-gradient($dir) {
   background: linear-gradient(to #{$dir},
-                              transparentize($selected_bg_color, .3),
-                              transparentize($selected_bg_color, .5) 1px,
-                              transparentize($selected_bg_color, 1) 20px);
+                              transparentize($accent_color, .3),
+                              transparentize($accent_color, .5) 1px,
+                              transparentize($accent_color, 1) 20px);
 }
 
 tabbar {
@@ -145,8 +145,8 @@ dnd {
       background-image:
         radial-gradient(ellipse at bottom,
                         transparentize(white, .2),
-                        transparentize($selected_bg_color, .8) 15%,
-                        transparentize($selected_bg_color, 1) 15%);
+                        transparentize($accent_color, .8) 15%,
+                        transparentize($accent_color, 1) 15%);
     }
 
     button.image-button {
diff --git a/src/stylesheet/widgets/_text-selection.scss b/src/stylesheet/widgets/_text-selection.scss
index b7603014..a064d753 100644
--- a/src/stylesheet/widgets/_text-selection.scss
+++ b/src/stylesheet/widgets/_text-selection.scss
@@ -7,7 +7,7 @@ cursor-handle {
     min-height: 20px;
     border-radius: 50%;
 
-    background-color: $selected_bg_color;
+    background-color: $accent_color;
   }
 
   &.top > contents {
diff --git a/src/stylesheet/widgets/_toolbars.scss b/src/stylesheet/widgets/_toolbars.scss
index b5a2c1cf..bd940458 100644
--- a/src/stylesheet/widgets/_toolbars.scss
+++ b/src/stylesheet/widgets/_toolbars.scss
@@ -83,8 +83,8 @@ infobar {
     background-image: image(#{"alpha(currentColor, .1)"});
   }
 
-  @each $i_type, $i_color in (info, $selected_bg_color),
-                             (question, $selected_bg_color),
+  @each $i_type, $i_color in (info, $accent_color),
+                             (question, $accent_color),
                              (warning, $warning_color),
                              (error, $error_color) {
     &.#{$i_type} > revealer > box {
diff --git a/src/stylesheet/widgets/_trees.scss b/src/stylesheet/widgets/_trees.scss
index c6eafb1a..21d414b3 100644
--- a/src/stylesheet/widgets/_trees.scss
+++ b/src/stylesheet/widgets/_trees.scss
@@ -55,8 +55,8 @@ treeview.view {
     @if $variant == light { color: $base_color; }
 
     &, &:selected {
-      background-color: $selected_bg_color;
-      color: $selected_fg_color;
+      background-color: $accent_color;
+      color: $accent_text;
     }
 
     box-shadow: none;
@@ -111,7 +111,7 @@ treeview.view {
       padding: 0 6px;
       color: $base_color;
       background-image: none;
-      background-color: $selected_bg_color;
+      background-color: $accent_color;
       border-style: none;
       border-radius: 0;
       box-shadow: inset 0 0 0 1px $base_color;
@@ -179,7 +179,7 @@ columnview row:not(:selected) cell editablelabel:not(.editing):focus-within {
 }
 
 columnview row:not(:selected) cell editablelabel.editing:focus-within {
-  outline: 2px solid $selected_bg_color;
+  outline: 2px solid $accent_color;
 }
 
 treeexpander {
diff --git a/src/stylesheet/widgets/_views.scss b/src/stylesheet/widgets/_views.scss
index d5ceff5b..7993bd5d 100644
--- a/src/stylesheet/widgets/_views.scss
+++ b/src/stylesheet/widgets/_views.scss
@@ -48,8 +48,8 @@ iconview {
 }
 
 rubberband {
-  border: 1px solid $selected_bg_color;
-  background-color: transparentize($selected_bg_color, 0.8);
+  border: 1px solid $accent_color;
+  background-color: transparentize($accent_color, 0.8);
 }
 
 flowbox {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]