[libadwaita/wip/exalm/buttons-5: 11/20] stylesheet: Add a selected+active view color
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libadwaita/wip/exalm/buttons-5: 11/20] stylesheet: Add a selected+active view color
- Date: Fri, 11 Jun 2021 08:48:50 +0000 (UTC)
commit da4ec199b62b5d09307ca0d1d6c0e15c813c89c1
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Thu Jun 10 22:38:16 2021 +0500
stylesheet: Add a selected+active view color
This somehow fell through the cracks.
src/stylesheet/_colors.scss | 3 ++-
src/stylesheet/_drawing.scss | 6 ++++++
src/stylesheet/widgets/_buttons.scss | 2 +-
src/stylesheet/widgets/_lists.scss | 2 +-
src/stylesheet/widgets/_menus.scss | 2 +-
5 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss
index b7c9af72..1a304902 100644
--- a/src/stylesheet/_colors.scss
+++ b/src/stylesheet/_colors.scss
@@ -18,9 +18,10 @@ $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;
$view_hover_color: transparentize($text_color, .93);
+$view_active_color: transparentize($text_color, .84);
$view_selected_color: transparentize($text_color, .9);
$view_selected_hover_color: transparentize($text_color, .87);
-$view_active_color: transparentize($text_color, .84);
+$view_selected_active_color: transparentize($text_color, .81);
$trough_color: transparentize($text_color, .85);
$trough_hover_color: transparentize($text_color, .8);
$trough_active_color: transparentize($text_color, .75);
diff --git a/src/stylesheet/_drawing.scss b/src/stylesheet/_drawing.scss
index 204ce6dd..2dc1c2cc 100644
--- a/src/stylesheet/_drawing.scss
+++ b/src/stylesheet/_drawing.scss
@@ -241,6 +241,12 @@ $_default_button_c: lighten($bg_color,2%);
box-shadow: none;
background-color: $view_selected_hover_color;
}
+ @else if $t==undecorated-checked-active {
+ border-color: transparent;
+ background-image: none;
+ box-shadow: none;
+ background-color: $view_selected_active_color;
+ }
}
@mixin overshoot($p, $c:$fg_color) {
diff --git a/src/stylesheet/widgets/_buttons.scss b/src/stylesheet/widgets/_buttons.scss
index 99ee151b..d29be03d 100644
--- a/src/stylesheet/widgets/_buttons.scss
+++ b/src/stylesheet/widgets/_buttons.scss
@@ -70,7 +70,7 @@ button {
@include button(undecorated-checked-hover);
&:active {
- @include button(undecorated-active);
+ @include button(undecorated-checked-active);
}
}
}
diff --git a/src/stylesheet/widgets/_lists.scss b/src/stylesheet/widgets/_lists.scss
index d1f9ac55..15dabb6e 100644
--- a/src/stylesheet/widgets/_lists.scss
+++ b/src/stylesheet/widgets/_lists.scss
@@ -31,7 +31,7 @@ row {
&.has-open-popup,
&:hover { background-color: $view_selected_hover_color; }
- &:active { background-color: $view_active_color; }
+ &:active { background-color: $view_selected_active_color; }
}
}
diff --git a/src/stylesheet/widgets/_menus.scss b/src/stylesheet/widgets/_menus.scss
index 6af7304c..6db921ed 100644
--- a/src/stylesheet/widgets/_menus.scss
+++ b/src/stylesheet/widgets/_menus.scss
@@ -93,7 +93,7 @@ popover.menu {
background-color: $view_selected_color;
&:active {
- background-color: $view_active_color; // matching buttons
+ background-color: $view_selected_active_color; // matching buttons
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]