commit 33d8f60a00e4fdd42c75b0435e0d547c34091d78
Author: Jakub Steiner <jimmac gmail com>
Date: Thu Dec 13 10:54:30 2018 +0100
Adwaita: remove chin from circular buttons
https://gitlab.gnome.org/GNOME/gtk/issues/1510
gtk/theme/Adwaita/_common.scss | 10 ++--------
gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++--
gtk/theme/Adwaita/gtk-contained.css | 4 ++--
3 files changed, 6 insertions(+), 12 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 874c022c1f..e176988cc0 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -865,20 +865,14 @@ button {
&:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) {
@include button(normal);
- $button_fill: if($variant == 'light', linear-gradient(to top, darken($bg_color, 4%), $bg_color),
- linear-gradient(to top, darken($bg_color, 1%), $bg_color));
- box-shadow: if($variant == 'light', inset 0 -2px darken($bg_color, 12%),
- inset 0 -2px darken($bg_color, 6%));
+
background-image: $button_fill, $_border_bg;
border-color: transparent;
}
&:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) {
@include button(hover);
- $button_fill: if($variant == 'light', linear-gradient(to top, $bg_color, lighten($bg_color, 2%)),
- linear-gradient(to top, darken($bg_color, 1%),
lighten($bg_color, 2%)));
- box-shadow: if($variant == 'light', inset 0 -2px darken($bg_color, 4%),
- inset 0 -2px darken($bg_color, 2%));
+
background-image: $button_fill, $_border_bg;
border-color: transparent;
}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index bbde974f43..a25ebbd055 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -384,9 +384,9 @@ button.circular { border-radius: 9999px; -gtk-outline-radius: 9999px; background
button.circular label { padding: 0; }
-button.circular:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec;
outline-color: rgba(238, 238, 236, 0.3); border-color: #252526; border-bottom-color: #111111;
background-image: linear-gradient(to top, #3c3c3d 2px, #3f3e40); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353);
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px
2px rgba(0, 0, 0, 0.07); box-shadow: inset 0 -2px #302f30; background-image: linear-gradient(to top, #3c3c3d,
#3f3e40), linear-gradient(to top, #111111 25%, #252526 50%); border-color: transparent; }
+button.circular:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec;
outline-color: rgba(238, 238, 236, 0.3); border-color: #252526; border-bottom-color: #111111;
background-image: linear-gradient(to top, #3c3c3d 2px, #3f3e40); text-shadow: 0 -1px rgba(0, 0, 0, 0.802353);
-gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.802353); box-shadow: inset 0 1px rgba(255, 255, 255, 0.02), 0 1px
2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #3c3c3d 2px, #3f3e40), linear-gradient(to
top, #111111 25%, #252526 50%); border-color: transparent; }
-button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec;
outline-color: rgba(238, 238, 236, 0.3); border-color: #252526; border-bottom-color: #111111; text-shadow: 0
-1px rgba(0, 0, 0, 0.754353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.754353); box-shadow: inset 0 1px
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #3c3c3d,
#414142 1px); box-shadow: inset 0 -2px #3a393b; background-image: linear-gradient(to top, #3c3c3d, #444345),
linear-gradient(to top, #111111 25%, #252526 50%); border-color: transparent; }
+button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #eeeeec;
outline-color: rgba(238, 238, 236, 0.3); border-color: #252526; border-bottom-color: #111111; text-shadow: 0
-1px rgba(0, 0, 0, 0.754353); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.754353); box-shadow: inset 0 1px
rgba(255, 255, 255, 0.02), 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #3c3c3d,
#414142 1px); background-image: linear-gradient(to top, #3c3c3d, #414142 1px), linear-gradient(to top,
#111111 25%, #252526 50%); border-color: transparent; }
.stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image,
stacksidebar row.needs-attention > label { animation: needs_attention 150ms ease-in; background-image:
-gtk-gradient(radial, center center, 0, center center, 0.5, to(#1f76e1), to(transparent)),
-gtk-gradient(radial, center center, 0, center center, 0.45, to(rgba(0, 0, 0, 0.802353)), to(transparent));
background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 2px; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 9843b977b8..15f7850ca6 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -386,9 +386,9 @@ button.circular { border-radius: 9999px; -gtk-outline-radius: 9999px; background
button.circular label { padding: 0; }
-button.circular:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #2e3436;
outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image:
linear-gradient(to top, #edebe9 2px, #f6f5f4); text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0,
0.07); box-shadow: inset 0 -2px #dad6d2; background-image: linear-gradient(to top, #edebe9, #f6f5f4),
linear-gradient(to top, #bfb8b1 25%, #cdc7c2 50%); border-color: transparent; }
+button.circular:not(.flat):not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #2e3436;
outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; background-image:
linear-gradient(to top, #edebe9 2px, #f6f5f4); text-shadow: 0 1px rgba(255, 255, 255, 0.769231);
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px white, 0 1px 2px rgba(0, 0, 0,
0.07); background-image: linear-gradient(to top, #edebe9 2px, #f6f5f4), linear-gradient(to top, #bfb8b1 25%,
#cdc7c2 50%); border-color: transparent; }
-button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #2e3436;
outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px
rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px
white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px);
box-shadow: inset 0 -2px #edebe9; background-image: linear-gradient(to top, #f6f5f4, #fbfafa),
linear-gradient(to top, #bfb8b1 25%, #cdc7c2 50%); border-color: transparent; }
+button.circular:hover:not(:checked):not(:active):not(:disabled):not(:backdrop) { color: #2e3436;
outline-color: rgba(46, 52, 54, 0.3); border-color: #cdc7c2; border-bottom-color: #bfb8b1; text-shadow: 0 1px
rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); box-shadow: inset 0 1px
white, 0 1px 2px rgba(0, 0, 0, 0.07); background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px);
background-image: linear-gradient(to top, #f6f5f4, #f8f8f7 1px), linear-gradient(to top, #bfb8b1 25%, #cdc7c2
50%); border-color: transparent; }
.stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image,
stacksidebar row.needs-attention > label { animation: needs_attention 150ms ease-in; background-image:
-gtk-gradient(radial, center center, 0, center center, 0.5, to(#3584e4), to(transparent)),
-gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(255, 255, 255, 0.769231)),
to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right
3px, right 4px; }