From: Lapo Calamandrei Date: Wed, 15 Apr 2015 19:53:11 +0000 (+0200) Subject: Adwaita: clearer comment for colorbutton hack X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~24^2~9889 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a5685ba05abd34d0bd9e4a1a47a8dc11116d2253;p=gtk4.git Adwaita: clearer comment for colorbutton hack --- diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index da11e78ae6..447309213a 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 4befff93ee..4e39922279 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 100ade1f39..1d5dbe2cb1 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; } /*********