[libadwaita/wip/exalm/recoloring: 14/15] Recoloring
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libadwaita/wip/exalm/recoloring: 14/15] Recoloring
- Date: Sun, 23 May 2021 20:30:09 +0000 (UTC)
commit 29f6f30a074cd8b128cf66bec066be41b4df6ba9
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Thu May 20 00:05:47 2021 +0500
Recoloring
src/stylesheet/_colors.scss | 10 +++++-----
src/stylesheet/_common.scss | 2 +-
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/_tab-view.scss | 10 +++++-----
src/stylesheet/widgets/_text-selection.scss | 2 +-
src/stylesheet/widgets/_trees.scss | 8 ++++----
src/stylesheet/widgets/_views.scss | 4 ++--
12 files changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss
index c6f0e18f..82c06b65 100644
--- a/src/stylesheet/_colors.scss
+++ b/src/stylesheet/_colors.scss
@@ -24,10 +24,10 @@ $view_active_color: transparentize(black, .85);
$trough_color: transparentize($text_color, .85);
$trough_hover_color: transparentize($text_color, .8);
$trough_active_color: transparentize(black, .75);
-$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, black, 80%);
+$fill_color: #{'@theme_selected_bg_color'};
+$fill_text_color: #{'@theme_selected_fg_color'};
+$fill_hover_color: #{'mix(@theme_selected_bg_color, #{$text_color}, .1)'};
+$fill_active_color: #{'mix(@theme_selected_bg_color, black, .2)'};
$slider_color: mix(white, $base_color, 80%);
$slider_hover_color: white;
@@ -63,7 +63,7 @@ $insensitive_borders_color: mix($borders_color, $bg_color, 80%);
//special cased widget colors
$suggested_bg_color: $selected_bg_color;
$suggested_border_color: $selected_borders_color;
-$focus_border_color: if($variant == 'light', transparentize($selected_bg_color, 0.5),
transparentize($selected_bg_color, 0.3));
+$focus_border_color: #{'alpha(@theme_selected_bg_color, .5)'};
$alt_focus_border_color: if($variant == 'light', transparentize(white, 0.2), transparentize(white,0.7));
$dim_label_opacity: 0.55;
diff --git a/src/stylesheet/_common.scss b/src/stylesheet/_common.scss
index e7072a3e..a7845786 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: #{'alpha(@theme_selected_bg_color, .3)'};
}
}
diff --git a/src/stylesheet/widgets/_calendar.scss b/src/stylesheet/widgets/_calendar.scss
index 89b535e2..8293fa26 100644
--- a/src/stylesheet/widgets/_calendar.scss
+++ b/src/stylesheet/widgets/_calendar.scss
@@ -31,10 +31,10 @@ calendar {
&:selected {
border-radius: 3px;
- background-color: $selected_bg_color;
- color: $selected_fg_color;
+ background-color: #{'@theme_selected_bg_color'};
+ color: #{'@theme_selected_fg_color'};
- &:disabled { color: mix($selected_fg_color, $selected_bg_color, 50%); }
+ &:disabled { color: #{'alpha(@theme_selected_bg_color, .5)'}; }
}
}
diff --git a/src/stylesheet/widgets/_entries.scss b/src/stylesheet/widgets/_entries.scss
index 57be96b4..fd113c1c 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: #{'@theme_selected_bg_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: #{'@theme_selected_bg_color'};
border-style: solid;
box-shadow: none;
}
@@ -153,6 +153,6 @@ treeview entry {
background-image: none;
background-color: $base_color;
- &:focus-within { border-color: $selected_bg_color; }
+ &:focus-within { border-color: #{'@theme_selected_bg_color'}; }
}
}
diff --git a/src/stylesheet/widgets/_header-bar.scss b/src/stylesheet/widgets/_header-bar.scss
index 4ea84f4e..6921b252 100644
--- a/src/stylesheet/widgets/_header-bar.scss
+++ b/src/stylesheet/widgets/_header-bar.scss
@@ -156,11 +156,11 @@ window.devel {
headerbar {
$c: darken($bg_color, 10%);
$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%, #{'alpha(@theme_selected_bg_color, 0.2)'}),
$_header_bar_gradient;
@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%, #{'alpha(@theme_selected_bg_color, 0.1)'}),
$_header_bar_gradient;
}
diff --git a/src/stylesheet/widgets/_lists.scss b/src/stylesheet/widgets/_lists.scss
index d1f9ac55..dc703c1e 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: #{'@theme_selected_bg_color'};
}
& image.expander-row-arrow:disabled {
diff --git a/src/stylesheet/widgets/_notebook.scss b/src/stylesheet/widgets/_notebook.scss
index bf0060d0..6cfac367 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 #{'@theme_selected_bg_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 #{'@theme_selected_bg_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 #{'@theme_selected_bg_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 #{'@theme_selected_bg_color'}; }
}
}
}
diff --git a/src/stylesheet/widgets/_paned.scss b/src/stylesheet/widgets/_paned.scss
index 09f2681f..6ba2c9f6 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(#{'@theme_selected_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 e1489fbd..3dd5629f 100644
--- a/src/stylesheet/widgets/_tab-view.scss
+++ b/src/stylesheet/widgets/_tab-view.scss
@@ -15,9 +15,9 @@ $tab_bg: darken($bg_color, if($variant == 'dark', 6%, 12%));
@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);
+ #{'alpha(@theme_selected_bg_color, .7)'},
+ #{'alpha(@theme_selected_bg_color, .5)'} 1px,
+ #{'alpha(@theme_selected_bg_color, 0)'} 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%);
+ #{'alpha(@theme_selected_bg_color, .2)'} 15%,
+ transparent 15%);
}
button.image-button {
diff --git a/src/stylesheet/widgets/_text-selection.scss b/src/stylesheet/widgets/_text-selection.scss
index 2d6ed479..08e76ec0 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: #{'@theme_selected_bg_color'};
}
&.top > contents {
diff --git a/src/stylesheet/widgets/_trees.scss b/src/stylesheet/widgets/_trees.scss
index 38a47923..9c55a6af 100644
--- a/src/stylesheet/widgets/_trees.scss
+++ b/src/stylesheet/widgets/_trees.scss
@@ -54,8 +54,8 @@ treeview.view {
@if $variant == light { color: $base_color; }
&, &:selected {
- background-color: $selected_bg_color;
- color: $selected_fg_color;
+ background-color: #{'@theme_selected_bg_color'};
+ color: #{'@theme_selected_fg_color'};
}
box-shadow: none;
@@ -110,7 +110,7 @@ treeview.view {
padding: 0 6px;
color: $base_color;
background-image: none;
- background-color: $selected_bg_color;
+ background-color: #{'@theme_selected_bg_color'};
border-style: none;
border-radius: 0;
box-shadow: inset 0 0 0 1px $base_color;
@@ -177,7 +177,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 #{'@theme_selected_bg_color'};
}
treeexpander {
diff --git a/src/stylesheet/widgets/_views.scss b/src/stylesheet/widgets/_views.scss
index d5ceff5b..15e26f7a 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 #{'@theme_selected_bg_color'};
+ background-color: #{'alpha(@theme_selected_bg_color, 0.2)'};
}
flowbox {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]