[gnome-shell/wip/jimmac/frederik-light] theme: regular buttons to match gtk
- From: Jakub Steiner <jimmac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/wip/jimmac/frederik-light] theme: regular buttons to match gtk
- Date: Thu, 30 May 2019 10:55:16 +0000 (UTC)
commit 6cab54f5f5dd0e03023e8d3cf1eae2a256bbb72b
Author: Jakub Steiner <jimmac gmail com>
Date: Thu May 30 12:54:52 2019 +0200
theme: regular buttons to match gtk
data/theme/gnome-shell-sass/_colors.scss | 1 +
data/theme/gnome-shell-sass/_common.scss | 12 ++----------
data/theme/gnome-shell-sass/_drawing.scss | 9 +++++----
data/theme/gnome-shell-sass/_high-contrast-colors.scss | 1 +
4 files changed, 9 insertions(+), 14 deletions(-)
---
diff --git a/data/theme/gnome-shell-sass/_colors.scss b/data/theme/gnome-shell-sass/_colors.scss
index 9eb251772..a253444a4 100644
--- a/data/theme/gnome-shell-sass/_colors.scss
+++ b/data/theme/gnome-shell-sass/_colors.scss
@@ -29,6 +29,7 @@ $osd_borders_color: transparentize(black, 0.3);
$osd_outer_borders_color: if($variant=='light', transparentize(black, 0.6), #3d3d3d);
$tooltip_borders_color: $osd_outer_borders_color;
+$shadow_color: transparentize(black, 0.9);
//insensitive state derived colors
$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index af664bac6..eae55e764 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -45,7 +45,7 @@ stage {
/* WIDGETS */
/* Buttons */
-.button {
+.button, %button {
border-radius: 5px;
border-width: 1px;
min-height: 22px;
@@ -1067,15 +1067,7 @@ StScrollBar {
}
.message-list-clear-button.button {
- background-color: $bg_color;
- color: $fg_color;
- box-shadow: none;
- border-color: $_bubble_borders_color;
- &:hover,&:focus { background-color: $_hover_bg_color; }
- &:active {
- background-color: $selected_bg_color;
- color: $selected_fg_color;
- }
+ @extend %button;
margin: 1.5em 1.5em 0;
}
diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index 4ff2e7451..627b2a3ac 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -127,7 +127,7 @@
$_hilight_color: _button_hilight_color($c);
$_button_edge: if($edge == none, none, _widget_edge($edge));
$_blank_edge: if($edge == none, none, _widget_edge(transparentize($edge,1)));
-
+ $_button_shadow: 0 1px 2px transparentize($shadow_color, 0.03);
@if $t==normal {
//
@@ -137,7 +137,7 @@
color: $tc;
background-color: $c;
border-color: $borders_color;
- box-shadow: none;
+ box-shadow: $_button_shadow;
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
}
@@ -148,7 +148,7 @@
color: $tc;
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
- box-shadow: inset 0px 0px 0px 1px $selected_bg_color;
+ box-shadow: $_button_shadow, inset 0px 0px 0px 1px $selected_bg_color;
}
@else if $t==hover {
@@ -158,7 +158,7 @@
color: $tc;
border-color: $borders_color;
background-color: $c;
- box-shadow: none;
+ box-shadow: $_button_shadow;
text-shadow: 0 1px black;
icon-shadow: 0 1px black;
@@ -172,6 +172,7 @@
background-color: $c;
text-shadow: none;
icon-shadow: none;
+ box-shadow: none;
}
@else if $t==insensitive {
diff --git a/data/theme/gnome-shell-sass/_high-contrast-colors.scss
b/data/theme/gnome-shell-sass/_high-contrast-colors.scss
index af1e52f0c..cba0145ac 100644
--- a/data/theme/gnome-shell-sass/_high-contrast-colors.scss
+++ b/data/theme/gnome-shell-sass/_high-contrast-colors.scss
@@ -26,6 +26,7 @@ $osd_borders_color: transparentize(black, 0.3);
$osd_outer_borders_color: transparentize(white, 0.9);
$tooltip_borders_color: $osd_outer_borders_color;
+$shadow_color: transparentize(black, 0.9);
//insensitive state derived colors
$insensitive_fg_color: mix($fg_color, $bg_color, 50%);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]