AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-17 06:10:15 +00:00
Code Issues Projects Releases Wiki Activity

Adwaita: button.color fix

Browse Source 
border-radius: 0 for colorswatch overlay as well.
This commit is contained in:
Lapo Calamandrei 2015-12-02 17:42:42 +01:00
parent a25fa9922d
commit 8efdd94a31
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/theme/Adwaita/_common.scss
View File

@ -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,

11
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -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; }
/*********

11
gtk/theme/Adwaita/gtk-contained.css
View File

@ -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; }
/*********