AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-16 23:24:16 +00:00
Code Issues Projects Releases Wiki Activity

HighContrastInverse: Fix suggested-action colors

Browse Source 
Choose a suitable foreground color instead of hardcoding white.

https://bugzilla.gnome.org/show_bug.cgi?id=764170
This commit is contained in:
Matthias Clasen 2016-03-25 22:43:57 -04:00
parent 28fe00fc68
commit aee69615bc
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/theme/HighContrast/_common.scss
View File

@ -555,10 +555,10 @@ button {
} }
// Suggested and Destructive Action buttons // Suggested and Destructive Action buttons
@each $b_type, $b_color in (suggested-action, $selected_bg_color), @each $b_type, $b_color, $f_color in (suggested-action, $selected_bg_color, $selected_fg_color),
(destructive-action, $destructive_color) { (destructive-action, $destructive_color, white) {
&.#{$b_type} { &.#{$b_type} {
@include button(normal, $b_color, white); @include button(normal, $b_color, $f_color);
&.flat { &.flat {
@include button(undecorated); @include button(undecorated);
@ -566,23 +566,23 @@ button {
color: $b_color; //FIXME: does it work on the dark variant? color: $b_color; //FIXME: does it work on the dark variant?
} }
&:hover { @include button(hover, $b_color, white); } &:hover { @include button(hover, $b_color, $f_color); }
&:active, &:active,
&:checked { @include button(active, $b_color, white); } &:checked { @include button(active, $b_color, $f_color); }
&:backdrop, &:backdrop,
&.flat:backdrop { &.flat:backdrop {
@include button(backdrop, $b_color, white); @include button(backdrop, $b_color, $f_color);
&:active, &:active,
&:checked { @include button(backdrop-active, $b_color, white); } &:checked { @include button(backdrop-active, $b_color, $f_color); }
&:disabled { &:disabled {
@include button(backdrop-insensitive); @include button(backdrop-insensitive);
&:active, &:active,
&:checked { @include button(backdrop-insensitive-active, $b_color, white); } &:checked { @include button(backdrop-insensitive-active, $b_color, $f_color); }
} }
} }
@ -598,7 +598,7 @@ button {
@include button(insensitive); @include button(insensitive);
&:active, &:active,
&:checked { @include button(insensitive-active, $b_color, white); } &:checked { @include button(insensitive-active, $b_color, $f_color); }
} }
.osd & { .osd & {

8
gtk/theme/HighContrast/gtk-contained-inverse.css
View File

@ -600,7 +600,7 @@ popover.background.touch-selection button, popover.background.magnifier button,
button.suggested-action { button.suggested-action {
border-width: 2px; border-width: 2px;
border-style: solid; border-style: solid;
color: white; color: #000;
background-image: none; background-image: none;
background-color: #ddd; background-color: #ddd;
border-color: #9d9d9d; } border-color: #9d9d9d; }
@ -615,7 +615,7 @@ button.suggested-action {
button.suggested-action:hover { button.suggested-action:hover {
border-width: 2px; border-width: 2px;
border-style: solid; border-style: solid;
color: white; color: #000;
background-color: #ddd; background-color: #ddd;
border-color: #9d9d9d; border-color: #9d9d9d;
background-image: none; } background-image: none; }
@ -623,13 +623,13 @@ button.suggested-action {
border-width: 2px; border-width: 2px;
border-style: solid; border-style: solid;
background-image: none; background-image: none;
color: black; color: white;
background-color: #222222; background-color: #222222;
border-color: #9d9d9d; } border-color: #9d9d9d; }
button.suggested-action:backdrop, button.suggested-action.flat:backdrop { button.suggested-action:backdrop, button.suggested-action.flat:backdrop {
border-width: 2px; border-width: 2px;
border-style: solid; border-style: solid;
color: white; color: #000;
background-color: #ddd; background-color: #ddd;
border-color: #ddd; border-color: #ddd;
background-image: none; } background-image: none; }

6
gtk/theme/HighContrast/gtk-contained.css
View File

@ -602,7 +602,7 @@ popover.background.touch-selection button, popover.background.magnifier button,
button.suggested-action { button.suggested-action {
border-width: 2px; border-width: 2px;
border-style: solid; border-style: solid;
color: white; color: #fff;
background-image: none; background-image: none;
background-color: #000; background-color: #000;
border-color: black; } border-color: black; }
@ -617,7 +617,7 @@ button.suggested-action {
button.suggested-action:hover { button.suggested-action:hover {
border-width: 2px; border-width: 2px;
border-style: solid; border-style: solid;
color: white; color: #fff;
background-color: #000; background-color: #000;
border-color: black; border-color: black;
background-image: none; } background-image: none; }
@ -631,7 +631,7 @@ button.suggested-action {
button.suggested-action:backdrop, button.suggested-action.flat:backdrop { button.suggested-action:backdrop, button.suggested-action.flat:backdrop {
border-width: 2px; border-width: 2px;
border-style: solid; border-style: solid;
color: white; color: #fff;
background-color: #000; background-color: #000;
border-color: #000; border-color: #000;
background-image: none; } background-image: none; }