[gtk+] Adwaita: button.color fix
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Adwaita: button.color fix
- Date: Wed, 2 Dec 2015 16:43:52 +0000 (UTC)
commit 8efdd94a31112b0c7f3e459f47856c0f664aac1a
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Wed Dec 2 17:42:42 2015 +0100
Adwaita: button.color fix
border-radius: 0 for colorswatch overlay as well.
gtk/theme/Adwaita/_common.scss | 5 ++---
gtk/theme/Adwaita/gtk-contained-dark.css | 11 ++++++++---
gtk/theme/Adwaita/gtk-contained.css | 11 ++++++++---
3 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 022bbdf..7fef561 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -746,9 +746,8 @@ modelbutton.flat,
button.color {
padding: 5px; // Uniform padding on the GtkColorButton
- colorswatch:first-child:last-child { // :first-child:last-child for a specificity bump, it gets overridden
by the
- // colorpicker style, otherwise
- border-radius: 0;
+ > colorswatch:first-child:last-child { // :first-child:last-child for a specificity bump, it gets
overridden by the colorchooser style
+ > overlay, & { border-radius: 0; }
box-shadow: inset 0 1px 1px transparentize(black, 0.9),
_widget_edge();
&:insensitive,
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index e24a51a..3d4d4df 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1213,10 +1213,15 @@ modelbutton.flat,
button.color, headerbar button.color.titlebutton,
.titlebar button.color.titlebutton {
padding: 5px; }
- button.color colorswatch:first-child:last-child {
- border-radius: 0;
+ button.color > colorswatch:first-child:last-child, headerbar button.color.titlebutton >
colorswatch:first-child:last-child,
+ .titlebar button.color.titlebutton > colorswatch:first-child:last-child {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
- button.color colorswatch:first-child:last-child:insensitive, button.color
colorswatch:first-child:last-child:backdrop {
+ button.color > colorswatch:first-child:last-child > overlay, button.color >
colorswatch:first-child:last-child, headerbar button.color.titlebutton > colorswatch:first-child:last-child,
+ .titlebar button.color.titlebutton > colorswatch:first-child:last-child {
+ border-radius: 0; }
+ button.color > colorswatch:first-child:last-child:insensitive, headerbar button.color.titlebutton >
colorswatch:first-child:last-child:insensitive,
+ .titlebar button.color.titlebutton > colorswatch:first-child:last-child:insensitive, button.color >
colorswatch:first-child:last-child:backdrop, headerbar button.color.titlebutton >
colorswatch:first-child:last-child:backdrop,
+ .titlebar button.color.titlebutton > colorswatch:first-child:last-child:backdrop {
box-shadow: none; }
/*********
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 9081ad9..77c1b67 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1213,10 +1213,15 @@ modelbutton.flat,
button.color, headerbar button.color.titlebutton,
.titlebar button.color.titlebutton {
padding: 5px; }
- button.color colorswatch:first-child:last-child {
- border-radius: 0;
+ button.color > colorswatch:first-child:last-child, headerbar button.color.titlebutton >
colorswatch:first-child:last-child,
+ .titlebar button.color.titlebutton > colorswatch:first-child:last-child {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
- button.color colorswatch:first-child:last-child:insensitive, button.color
colorswatch:first-child:last-child:backdrop {
+ button.color > colorswatch:first-child:last-child > overlay, button.color >
colorswatch:first-child:last-child, headerbar button.color.titlebutton > colorswatch:first-child:last-child,
+ .titlebar button.color.titlebutton > colorswatch:first-child:last-child {
+ border-radius: 0; }
+ button.color > colorswatch:first-child:last-child:insensitive, headerbar button.color.titlebutton >
colorswatch:first-child:last-child:insensitive,
+ .titlebar button.color.titlebutton > colorswatch:first-child:last-child:insensitive, button.color >
colorswatch:first-child:last-child:backdrop, headerbar button.color.titlebutton >
colorswatch:first-child:last-child:backdrop,
+ .titlebar button.color.titlebutton > colorswatch:first-child:last-child:backdrop {
box-shadow: none; }
/*********
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]