HC: custom color button fixes

https://bugzilla.gnome.org/show_bug.cgi?id=753051
This commit is contained in:
Jakub Steiner 2015-07-31 15:42:34 +02:00
parent 18dddddbab
commit 230c248326
2 changed files with 20 additions and 8 deletions

View File

@ -2433,12 +2433,20 @@ GtkColorSwatch {
// make the add color button looks like, well, a button // make the add color button looks like, well, a button
&#add-color-button { &#add-color-button {
@include button(normal);
border-style: solid; // the borders are drawn by the overlay for standard colorswatches to have them semi border-style: solid; // the borders are drawn by the overlay for standard colorswatches to have them semi
border-width: 1px; // translucent on the colored background, here it's not necessary so they need to be set border-width: 1px; // translucent on the colored background, here it's not necessary so they need to be set
@include button(normal); box-shadow: none;
&:hover { @include button(hover); } &:hover { @include button(hover); }
&:backdrop { @include button(backdrop); } &:backdrop {
.overlay { @include button(undecorated); } // reset the overlay to not cover the button style underneat @include button(backdrop);
border-width: 1px;
color: $insensitive_fg_color;
}
.overlay {
@include button(undecorated);
border-width: 0; } // reset the overlay to not
// cover the button style underneat
} }
} }

View File

@ -2678,14 +2678,15 @@ GtkColorSwatch {
GtkColorSwatch.overlay:hover, GtkColorSwatch.overlay:selected:hover { GtkColorSwatch.overlay:hover, GtkColorSwatch.overlay:selected:hover {
border-color: black; } border-color: black; }
GtkColorSwatch#add-color-button { GtkColorSwatch#add-color-button {
border-style: solid;
border-width: 1px;
border-width: 2px; border-width: 2px;
border-style: solid; border-style: solid;
color: #000; color: #000;
background-image: none; background-image: none;
background-color: #fff; background-color: #fff;
border-color: #7f7f7f; } border-color: #7f7f7f;
border-style: solid;
border-width: 1px;
box-shadow: none; }
GtkColorSwatch#add-color-button:hover { GtkColorSwatch#add-color-button:hover {
border-width: 2px; border-width: 2px;
border-style: solid; border-style: solid;
@ -2701,10 +2702,13 @@ GtkColorSwatch {
border-color: #8b8b8b; border-color: #8b8b8b;
background-image: none; background-image: none;
text-shadow: none; text-shadow: none;
icon-shadow: none; } icon-shadow: none;
border-width: 1px;
color: #7f7f7f; }
GtkColorSwatch#add-color-button .overlay { GtkColorSwatch#add-color-button .overlay {
border-width: 2px; border-width: 2px;
border-style: solid; } border-style: solid;
border-width: 0; }
/********************** /**********************
* Window Decorations * * Window Decorations *