[gtk+/gtk-3-16] Adwaita: clearer comment for colorbutton hack
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-16] Adwaita: clearer comment for colorbutton hack
- Date: Mon, 11 May 2015 18:22:41 +0000 (UTC)
commit 5d3c596a84c30306b3e2e523e213724ce2ed4474
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Wed Apr 15 21:53:11 2015 +0200
Adwaita: clearer comment for colorbutton hack
gtk/theme/Adwaita/_common.scss | 3 ++-
gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++--
gtk/theme/Adwaita/gtk-contained.css | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index f144024..3db8343 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -816,7 +816,8 @@ $_dot_color: if($variant=='light', $selected_bg_color,
GtkColorButton.button {
padding: 5px; // Uniform padding on the GtkColorButton
- GtkColorSwatch:only-child:first-child:last-child { //*-child mess needed since we get overridden by the
colorpicker selectors
+ GtkColorSwatch:first-child:last-child { // :first-child:last-child for a specificity bump, it gets
overridden by the
+ // colorpicker style, otherwise
border-radius: 0;
box-shadow: inset 0 1px 1px transparentize(black, 0.9),
_widget_edge();
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index df270ab..28aa9af 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1316,10 +1316,10 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton,
GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
.titlebar GtkColorButton.button.titlebutton {
padding: 5px; }
- GtkColorButton.button GtkColorSwatch:only-child:first-child:last-child {
+ GtkColorButton.button GtkColorSwatch:first-child:last-child {
border-radius: 0;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
- GtkColorButton.button GtkColorSwatch:only-child:first-child:last-child:insensitive,
GtkColorButton.button GtkColorSwatch:only-child:first-child:last-child:backdrop {
+ GtkColorButton.button GtkColorSwatch:first-child:last-child:insensitive, GtkColorButton.button
GtkColorSwatch: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 b7b32f1..687a2af 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1316,10 +1316,10 @@ GtkComboBox.combobox-entry .titlebar .button.titlebutton,
GtkColorButton.button, .header-bar GtkColorButton.button.titlebutton,
.titlebar GtkColorButton.button.titlebutton {
padding: 5px; }
- GtkColorButton.button GtkColorSwatch:only-child:first-child:last-child {
+ GtkColorButton.button GtkColorSwatch:first-child:last-child {
border-radius: 0;
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
- GtkColorButton.button GtkColorSwatch:only-child:first-child:last-child:insensitive,
GtkColorButton.button GtkColorSwatch:only-child:first-child:last-child:backdrop {
+ GtkColorButton.button GtkColorSwatch:first-child:last-child:insensitive, GtkColorButton.button
GtkColorSwatch:first-child:last-child:backdrop {
box-shadow: none; }
/*********
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]