[gnome-shell/wip/snwh/sass-cleanup: 468/475] theme: refine the button drawing functions; update notifications & keyboard buttons
- From: Sam Hewitt <snwh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/snwh/sass-cleanup: 468/475] theme: refine the button drawing functions; update notifications & keyboard buttons
- Date: Wed, 18 Dec 2019 16:03:43 +0000 (UTC)
commit 27f34e2f75e74b3000d9665a0984e6bae4fb5a3e
Author: Sam Hewitt <sam snwh org>
Date: Thu Dec 5 14:38:37 2019 -0500
theme: refine the button drawing functions; update notifications & keyboard buttons
data/theme/gnome-shell-sass/widgets/_keyboard.scss | 15 ++++++++-------
data/theme/gnome-shell-sass/widgets/_message-list.scss | 18 +++++++++---------
2 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/widgets/_keyboard.scss
b/data/theme/gnome-shell-sass/widgets/_keyboard.scss
index 84400d53ef..5cd9caf250 100644
--- a/data/theme/gnome-shell-sass/widgets/_keyboard.scss
+++ b/data/theme/gnome-shell-sass/widgets/_keyboard.scss
@@ -2,15 +2,14 @@
$key_size: 1.2em;
$key_border_radius: $base_border_radius + 3px;
-$key_bg_color: lighten($bg_color, if($variant=='light', 0%, 2%));
+$key_bg_color: $bg_color;
// $default_key_bg_color: darken($key_bg_color, 4%);
$default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten($osd_bg_color, 2%));
// draw keys using button function
%keyboard_key {
-
- @include button(normal, $c:$key_bg_color, $tc:$osd_fg_color);
+ @include button(normal, $c:$key_bg_color);
&:focus { @include button(focus);}
&:hover, &:checked { @include button(hover, $c: $key_bg_color);}
@@ -26,14 +25,16 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
.page-indicator-icon {
width: 6px;
- height: 6px
+ height: 6px;
+ &:checked {
+ background-color:red;
+ }
}
}
}
// the container for individual keys
.key-container {
- background-color: transparent;
padding: $base_margin;
spacing: $base_margin;
}
@@ -47,8 +48,8 @@ $default_key_bg_color: if($variant=='light', darken($osd_bg_color, 11%), lighten
border-radius: $key_border_radius;
- &:grayed { //FIXME
- background-color: $bg_color;
+ &:grayed { //FIXMEy
+ background-color: darken($bg_color, 3%);
color: $osd_fg_color;
border-color: $osd_borders_color;
}
diff --git a/data/theme/gnome-shell-sass/widgets/_message-list.scss
b/data/theme/gnome-shell-sass/widgets/_message-list.scss
index 4c5e072910..fbcec05adf 100644
--- a/data/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/data/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -111,16 +111,16 @@
// border: 0 solid $borders_color;
// border-left-width:1px;
- &:hover {
+ &:last-child:ltr {
+ border-radius: 0 calc(#{$base_border_radius} + 2px) calc(#{$base_border_radius} + 2px) 0;
+ }
+ &:last-child:rtl {
+ border-radius: calc(#{$base_border_radius} + 2px) 0 0 calc(#{$base_border_radius} + 2px);
+ }
+
+ &:hover {
background-color: lighten($hover_bg_color, 5%);
color: $fg_color;
-
- &:last-child:ltr {
- border-radius: 0 $base_border_radius $base_border_radius 0;
- }
- &:last-child:rtl {
- border-radius: $base_border_radius 0 0 $base_border_radius;
- }
}
&:active {
@@ -138,7 +138,7 @@
// when there is no artwork
&.fallback {
- color: darken($fg_color, 10%);
+ color: darken($fg_color, 17%);
background-color: $bg_color;
border: 1px solid transparent;
border-radius: $base_border_radius;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]