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: fix view check/radio selected state.

Browse Source
This commit is contained in:
Lapo Calamandrei 2014-06-24 10:25:49 +02:00
parent 58b2d2cd0c
commit 793a3eab82
3 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/resources/theme/Adwaita/_common.scss
View File

@ -1182,6 +1182,8 @@ GtkSwitch {
$asset_suffix: if($variant=='dark', '-dark', '');
@each $w,$a in ('check', 'checkbox'),
('radio','radio') {
//standard checks and radios
@each $s,$as in ('','-unchecked'),
(':hover', '-unchecked-hover'),
(':selected', '-unchecked-active'),
@ -1253,15 +1255,17 @@ $asset_suffix: if($variant=='dark', '-dark', '');
&:inconsistent {
-gtk-icon-source: -gtk-icontheme('#{$a}-mixed-symbolic');
}
&:selected {
&:selected, &:selected:focus {
// :selected:focus not to get overridden by .view style
color: transparentize($selected_fg_color,0.9);
&:active {
color: $selected_fg_color;
&:backdrop { color: $backdrop_base_color; }
}
&:backdrop {
color: transparentize($backdrop_fg_color,0.9);
}
}
&:backdrop {
color: transparentize($backdrop_fg_color,0.9);
&:selected { color: transparentize($backdrop_base_color,0.9); }
}
}
@ -1882,6 +1886,7 @@ GtkColorChooserWidget #add-color-button {
}
}
/**********************
* Window Decorations *
*********************/

24
gtk/resources/theme/Adwaita/gtk-contained-dark.css
View File

@ -1485,14 +1485,16 @@ GtkSwitch {
color: transparent; }
.view.check:inconsistent {
-gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
.view.check:selected {
.view.check:selected, .view.check:selected:focus {
color: rgba(255, 255, 255, 0.1); }
.view.check:selected:active {
.view.check:selected:active, .view.check:selected:focus:active {
color: white; }
.view.check:selected:active:backdrop {
.view.check:selected:active:backdrop, .view.check:selected:focus:active:backdrop {
color: #2c2c2c; }
.view.check:selected:backdrop {
color: rgba(201, 203, 201, 0.1); }
.view.check:backdrop {
color: rgba(201, 203, 201, 0.1); }
.view.check:backdrop:selected {
color: rgba(44, 44, 44, 0.1); }
.popover .button.check:hover {
color: rgba(238, 238, 236, 0.1); }
@ -1630,14 +1632,16 @@ GtkSwitch {
color: transparent; }
.view.radio:inconsistent {
-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
.view.radio:selected {
.view.radio:selected, .view.radio:selected:focus {
color: rgba(255, 255, 255, 0.1); }
.view.radio:selected:active {
.view.radio:selected:active, .view.radio:selected:focus:active {
color: white; }
.view.radio:selected:active:backdrop {
.view.radio:selected:active:backdrop, .view.radio:selected:focus:active:backdrop {
color: #2c2c2c; }
.view.radio:selected:backdrop {
color: rgba(201, 203, 201, 0.1); }
.view.radio:backdrop {
color: rgba(201, 203, 201, 0.1); }
.view.radio:backdrop:selected {
color: rgba(44, 44, 44, 0.1); }
.popover .button.radio:hover {
color: rgba(238, 238, 236, 0.1); }

24
gtk/resources/theme/Adwaita/gtk-contained.css
View File

@ -1484,14 +1484,16 @@ GtkSwitch {
color: transparent; }
.view.check:inconsistent {
-gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
.view.check:selected {
.view.check:selected, .view.check:selected:focus {
color: rgba(255, 255, 255, 0.1); }
.view.check:selected:active {
.view.check:selected:active, .view.check:selected:focus:active {
color: white; }
.view.check:selected:active:backdrop {
.view.check:selected:active:backdrop, .view.check:selected:focus:active:backdrop {
color: #fcfcfc; }
.view.check:selected:backdrop {
color: rgba(84, 89, 90, 0.1); }
.view.check:backdrop {
color: rgba(84, 89, 90, 0.1); }
.view.check:backdrop:selected {
color: rgba(252, 252, 252, 0.1); }
.popover .button.check:hover {
color: rgba(46, 52, 54, 0.1); }
@ -1629,14 +1631,16 @@ GtkSwitch {
color: transparent; }
.view.radio:inconsistent {
-gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
.view.radio:selected {
.view.radio:selected, .view.radio:selected:focus {
color: rgba(255, 255, 255, 0.1); }
.view.radio:selected:active {
.view.radio:selected:active, .view.radio:selected:focus:active {
color: white; }
.view.radio:selected:active:backdrop {
.view.radio:selected:active:backdrop, .view.radio:selected:focus:active:backdrop {
color: #fcfcfc; }
.view.radio:selected:backdrop {
color: rgba(84, 89, 90, 0.1); }
.view.radio:backdrop {
color: rgba(84, 89, 90, 0.1); }
.view.radio:backdrop:selected {
color: rgba(252, 252, 252, 0.1); }
.popover .button.radio:hover {
color: rgba(46, 52, 54, 0.1); }