[libadwaita/wip/exalm/accent: 6/9] stylesheet: Rename accent_color/text to accent_bg/fg_color
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libadwaita/wip/exalm/accent: 6/9] stylesheet: Rename accent_color/text to accent_bg/fg_color
- Date: Wed, 23 Jun 2021 14:31:07 +0000 (UTC)
commit c974df05d30002d68efdee768442d9f2baa314a8
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Wed Jun 23 12:09:23 2021 +0500
stylesheet: Rename accent_color/text to accent_bg/fg_color
This will allow us to name the other color accent.
src/stylesheet/_colors.scss | 20 ++++++++++----------
src/stylesheet/_common.scss | 2 +-
src/stylesheet/_defaults.scss | 4 ++--
src/stylesheet/_drawing.scss | 2 +-
src/stylesheet/widgets/_buttons.scss | 10 +++++-----
src/stylesheet/widgets/_calendar.scss | 6 +++---
src/stylesheet/widgets/_entries.scss | 4 ++--
src/stylesheet/widgets/_notebook.scss | 8 ++++----
src/stylesheet/widgets/_paned.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/_view-switcher.scss | 2 +-
src/stylesheet/widgets/_views.scss | 4 ++--
15 files changed, 44 insertions(+), 44 deletions(-)
---
diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss
index 512600fa..4d760535 100644
--- a/src/stylesheet/_colors.scss
+++ b/src/stylesheet/_colors.scss
@@ -6,8 +6,8 @@ $dark_fg: #eeeeec;
$light_bg: $light_2;
$dark_bg: darken(desaturate($dark_3, 100%), 4%);
-$accent_color: gtkcolor(accent_color);
-$accent_text: gtkcolor(accent_text);
+$accent_bg_color: gtkcolor(accent_bg_color);
+$accent_fg_color: gtkcolor(accent_fg_color);
$destructive_color: gtkcolor(destructive_color);
$destructive_text: gtkcolor(destructive_text);
@@ -20,7 +20,7 @@ $text_color: if($variant == 'light', black, white);
$bg_color: if($variant == 'light', $light_bg, $dark_bg);
$fg_color: if($variant == 'light', $light_fg, $dark_fg);
-$accent_standalone_color: gtkmix($accent_color, $text_color, if($variant == 'dark', 50%, 75%));
+$accent_standalone_color: gtkmix($accent_bg_color, $text_color, if($variant == 'dark', 50%, 75%));
$destructive_standalone_color: gtkmix($destructive_color, $text_color, if($variant == 'dark', 50%, 75%));
$borders_color: if($variant == 'light', darken($bg_color, 18%), darken($bg_color, 10%));
@@ -49,10 +49,10 @@ $button_checked_color: gtkalpha(currentColor, .2);
$button_checked_hover_color: gtkalpha(currentColor, .25);
$button_checked_active_color: gtkalpha(currentColor, .35);
-$fill_color: $accent_color;
-$fill_text_color: $accent_text;
-$fill_hover_color: gtkmix($accent_color, currentColor, 90%);
-$fill_active_color: gtkmix($accent_color, black, 80%);
+$fill_color: $accent_bg_color;
+$fill_text_color: $accent_fg_color;
+$fill_hover_color: gtkmix($accent_bg_color, currentColor, 90%);
+$fill_active_color: gtkmix($accent_bg_color, black, 80%);
$slider_color: mix(white, $base_color, 80%);
$slider_hover_color: white;
@@ -60,7 +60,7 @@ $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: $accent_color;
+$scrollbar_slider_active_color: $accent_bg_color;
$osd_fg_color: $dark_fg;
$osd_text_color: white;
@@ -82,7 +82,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: gtkalpha($accent_color, 0.5);
+$focus_border_color: gtkalpha($accent_bg_color, 0.5);
$alt_focus_border_color: if($variant == 'light', transparentize(white, 0.2), transparentize(white,0.7));
$dim_label_opacity: 0.55;
@@ -100,7 +100,7 @@ $dim_label_opacity: 0.55;
$insensitive_borders_color: mix($borders_color, $bg_color, 80%);
//focus rings
- $focus_border_color: gtkalpha($accent_color, 0.8);
+ $focus_border_color: gtkalpha($accent_bg_color, 0.8);
$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 bf77b901..896ac12d 100644
--- a/src/stylesheet/_common.scss
+++ b/src/stylesheet/_common.scss
@@ -43,7 +43,7 @@ selection {
color: transparent;
&:focus-within {
- background-color: gtkalpha($accent_color, 0.3);
+ background-color: gtkalpha($accent_bg_color, 0.3);
}
}
diff --git a/src/stylesheet/_defaults.scss b/src/stylesheet/_defaults.scss
index add61fed..caca940b 100644
--- a/src/stylesheet/_defaults.scss
+++ b/src/stylesheet/_defaults.scss
@@ -9,8 +9,8 @@
// define variables for them in _colors.scss
// The main accent color and the matching text value
-@define-color accent_color #{$blue_3};
-@define-color accent_text #{$light_1};
+@define-color accent_bg_color #{$blue_3};
+@define-color accent_fg_color #{$light_1};
// destructive-action buttons
@define-color destructive_color #{$red_3};
diff --git a/src/stylesheet/_drawing.scss b/src/stylesheet/_drawing.scss
index 40a71cc7..72f9efba 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: $accent_color;
+ border-color: $accent_bg_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 4ad9f416..8050ca8f 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, $accent_color 0%, transparent 0%); }
- to { background-image: radial-gradient(farthest-side, $accent_color 95%, transparent); }
+ from { background-image: radial-gradient(farthest-side, $accent_bg_color 0%, transparent 0%); }
+ to { background-image: radial-gradient(farthest-side, $accent_bg_color 95%, transparent); }
}
%button,
@@ -165,10 +165,10 @@ button {
&.suggested-action {
@extend %filled_button;
- color: $accent_text;
+ color: $accent_fg_color;
&, &:checked {
- background-color: $accent_color;
+ background-color: $accent_bg_color;
}
}
@@ -269,7 +269,7 @@ button {
// simulates the shadow labels and icons normally have in buttons.
animation: needs_attention 150ms ease-in;
- background-image: radial-gradient(farthest-side, $accent_color 96%, transparent);
+ background-image: radial-gradient(farthest-side, $accent_bg_color 96%, transparent);
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 5c03190a..278fbf0b 100644
--- a/src/stylesheet/widgets/_calendar.scss
+++ b/src/stylesheet/widgets/_calendar.scss
@@ -29,10 +29,10 @@ calendar {
&:selected {
border-radius: 3px;
- background-color: $accent_color;
- color: $accent_text;
+ background-color: $accent_bg_color;
+ color: $accent_fg_color;
- &:disabled { color: gtkmix($accent_text, $accent_color, 50%); }
+ &:disabled { color: gtkmix($accent_fg_color, $accent_bg_color, 50%); }
}
}
diff --git a/src/stylesheet/widgets/_entries.scss b/src/stylesheet/widgets/_entries.scss
index 554bfbdc..b189b0e3 100644
--- a/src/stylesheet/widgets/_entries.scss
+++ b/src/stylesheet/widgets/_entries.scss
@@ -90,7 +90,7 @@ entry {
background-image: none;
border-radius: 0;
border-width: 0 0 2px;
- border-color: $accent_color;
+ border-color: $accent_bg_color;
border-style: solid;
box-shadow: none;
}
@@ -110,6 +110,6 @@ treeview entry {
background-image: none;
background-color: $base_color;
- &:focus-within { border-color: $accent_color; }
+ &:focus-within { border-color: $accent_bg_color; }
}
}
diff --git a/src/stylesheet/widgets/_notebook.scss b/src/stylesheet/widgets/_notebook.scss
index c57bf320..c9b5bb26 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 $accent_color; }
+ &:checked { box-shadow: inset 0 -4px $accent_bg_color; }
}
}
}
@@ -29,7 +29,7 @@ notebook {
> tab {
&:hover { box-shadow: inset 0 4px $borders_color; }
- &:checked { box-shadow: inset 0 4px $accent_color; }
+ &:checked { box-shadow: inset 0 4px $accent_bg_color; }
}
}
}
@@ -41,7 +41,7 @@ notebook {
> tab {
&:hover { box-shadow: inset -4px 0 $borders_color; }
- &:checked { box-shadow: inset -4px 0 $accent_color; }
+ &:checked { box-shadow: inset -4px 0 $accent_bg_color; }
}
}
}
@@ -53,7 +53,7 @@ notebook {
> tab {
&:hover { box-shadow: inset 4px 0 $borders_color; }
- &:checked { box-shadow: inset 4px 0 $accent_color; }
+ &:checked { box-shadow: inset 4px 0 $accent_bg_color; }
}
}
}
diff --git a/src/stylesheet/widgets/_paned.scss b/src/stylesheet/widgets/_paned.scss
index 0ef6af62..06189f52 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($accent_color); } // FIXME is this needed?
+ &:selected { background-image: image($accent_bg_color); } // FIXME is this needed?
&.wide {
min-width: 5px;
diff --git a/src/stylesheet/widgets/_tab-view.scss b/src/stylesheet/widgets/_tab-view.scss
index 920d79b8..d238c978 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},
- gtkalpha($accent_color, .7),
- gtkalpha($accent_color, .5) 1px,
- gtkalpha($accent_color, 0) 20px);
+ gtkalpha($accent_bg_color, .7),
+ gtkalpha($accent_bg_color, .5) 1px,
+ gtkalpha($accent_bg_color, 0) 20px);
}
tabbar {
@@ -161,8 +161,8 @@ dnd {
background-image:
radial-gradient(ellipse at bottom,
transparentize(white, .2),
- gtkalpha($accent_color, .2) 15%,
- gtkalpha($accent_color, 0) 15%);
+ gtkalpha($accent_bg_color, .2) 15%,
+ gtkalpha($accent_bg_color, 0) 15%);
}
button.image-button {
diff --git a/src/stylesheet/widgets/_text-selection.scss b/src/stylesheet/widgets/_text-selection.scss
index a064d753..c2bb4b72 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: $accent_color;
+ background-color: $accent_bg_color;
}
&.top > contents {
diff --git a/src/stylesheet/widgets/_toolbars.scss b/src/stylesheet/widgets/_toolbars.scss
index 2fcb98c0..cc7a2067 100644
--- a/src/stylesheet/widgets/_toolbars.scss
+++ b/src/stylesheet/widgets/_toolbars.scss
@@ -83,8 +83,8 @@ infobar {
background-image: image(gtkalpha(currentColor, .1));
}
- @each $i_type, $i_color in (info, $accent_color),
- (question, $accent_color),
+ @each $i_type, $i_color in (info, $accent_bg_color),
+ (question, $accent_bg_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 21d414b3..e093bc91 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: $accent_color;
- color: $accent_text;
+ background-color: $accent_bg_color;
+ color: $accent_fg_color;
}
box-shadow: none;
@@ -111,7 +111,7 @@ treeview.view {
padding: 0 6px;
color: $base_color;
background-image: none;
- background-color: $accent_color;
+ background-color: $accent_bg_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 $accent_color;
+ outline: 2px solid $accent_bg_color;
}
treeexpander {
diff --git a/src/stylesheet/widgets/_view-switcher.scss b/src/stylesheet/widgets/_view-switcher.scss
index b3f64aee..c98c14e1 100644
--- a/src/stylesheet/widgets/_view-switcher.scss
+++ b/src/stylesheet/widgets/_view-switcher.scss
@@ -69,7 +69,7 @@ indicatorbin {
> mask { padding: 1px; }
> indicator, > mask {
- background: $accent_color;
+ background: $accent_bg_color;
min-width: 6px;
min-height: 6px;
border-radius: 100%;
diff --git a/src/stylesheet/widgets/_views.scss b/src/stylesheet/widgets/_views.scss
index b9db025d..821ac5bb 100644
--- a/src/stylesheet/widgets/_views.scss
+++ b/src/stylesheet/widgets/_views.scss
@@ -48,8 +48,8 @@ iconview {
}
rubberband {
- border: 1px solid $accent_color;
- background-color: gtkalpha($accent_color, 0.2);
+ border: 1px solid $accent_bg_color;
+ background-color: gtkalpha($accent_bg_color, 0.2);
}
flowbox {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
