AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Adwaita: special case selection mode lists checks

Browse Source 
...otherwise the special selection mode 40x40px checks are used
shrinked to 16x16.
See https://bugzilla.gnome.org/show_bug.cgi?id=754610
This commit is contained in:
Lapo Calamandrei 2015-09-08 20:10:51 +02:00 committed by Jakub Steiner
parent d52da39183
commit f7894a7588
3 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2160,14 +2160,6 @@ GtkSwitch {
&:selected, &:hover { icon-shadow: none; }
}
//content view (grid/list)
.content-view {
background-color: darken($bg_color,7%);
&:hover { -gtk-image-effect: highlight; }
&:backdrop { background-color: darken($bg_color,7%); }
&.rubberband { @extend .rubberband; }
}
//selection-mode
@each $s,$as in ('','-selectionmode'),
(':hover', '-hover-selectionmode'),
@ -2177,7 +2169,7 @@ GtkSwitch {
(':checked:hover', '-checked-hover-selectionmode'),
(':checked:active', '-checked-active-selectionmode'),
(':backdrop:checked', '-checked-backdrop-selectionmode') {
.view.content-view.check#{$s} {
.view.content-view.check#{$s}:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}.png"),
url("assets/checkbox#{$as}@2.png"));
@ -3202,6 +3194,14 @@ GtkColorSwatch {
* Misc *
********/
//content view (grid/list)
.content-view {
background-color: darken($bg_color,7%);
&:hover { -gtk-image-effect: highlight; }
&:backdrop { background-color: darken($bg_color,7%); }
&.rubberband { @extend .rubberband; }
}
.scale-popup {
.osd & { @extend %osd; }

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

@ -2821,49 +2821,42 @@ GtkSwitch {
.list-row .check:hover, list-row .radio:selected, list-row .radio:hover {
icon-shadow: none; }
.content-view {
background-color: #282c2c; }
.content-view:hover {
-gtk-image-effect: highlight; }
.content-view:backdrop {
background-color: #282c2c; }
.view.content-view.check {
.view.content-view.check:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:hover {
.view.content-view.check:hover:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:active {
.view.content-view.check:active:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:backdrop {
.view.content-view.check:backdrop:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:checked {
.view.content-view.check:checked:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:checked:hover {
.view.content-view.check:checked:hover:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-selectionmode.png"), url("assets/checkbox-checked-hover-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:checked:active {
.view.content-view.check:checked:active:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-selectionmode.png"), url("assets/checkbox-checked-active-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:backdrop:checked {
.view.content-view.check:backdrop:checked:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-selectionmode.png"), url("assets/checkbox-checked-backdrop-selectionmode@2.png"));
background-color: transparent; }
@ -4278,6 +4271,13 @@ GtkColorSwatch {
/********
* Misc *
********/
.content-view {
background-color: #282c2c; }
.content-view:hover {
-gtk-image-effect: highlight; }
.content-view:backdrop {
background-color: #282c2c; }
.osd .scale-popup .button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar .titlebutton.button, .header-bar .osd .scale-popup .titlebutton.button,
.osd .scale-popup .titlebar .titlebutton.button,
.titlebar .osd .scale-popup .titlebutton.button {

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

@ -2983,49 +2983,42 @@ GtkSwitch {
.list-row .check:hover, list-row .radio:selected, list-row .radio:hover {
icon-shadow: none; }
.content-view {
background-color: #dbdbdb; }
.content-view:hover {
-gtk-image-effect: highlight; }
.content-view:backdrop {
background-color: #dbdbdb; }
.view.content-view.check {
.view.content-view.check:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:hover {
.view.content-view.check:hover:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:active {
.view.content-view.check:active:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:backdrop {
.view.content-view.check:backdrop:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:checked {
.view.content-view.check:checked:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:checked:hover {
.view.content-view.check:checked:hover:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-hover-selectionmode.png"), url("assets/checkbox-checked-hover-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:checked:active {
.view.content-view.check:checked:active:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-active-selectionmode.png"), url("assets/checkbox-checked-active-selectionmode@2.png"));
background-color: transparent; }
.view.content-view.check:backdrop:checked {
.view.content-view.check:backdrop:checked:not(.list) {
icon-shadow: none;
-gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-backdrop-selectionmode.png"), url("assets/checkbox-checked-backdrop-selectionmode@2.png"));
background-color: transparent; }
@ -4450,6 +4443,13 @@ GtkColorSwatch {
/********
* Misc *
********/
.content-view {
background-color: #dbdbdb; }
.content-view:hover {
-gtk-image-effect: highlight; }
.content-view:backdrop {
background-color: #dbdbdb; }
.osd .scale-popup .button.flat, .osd .scale-popup .sidebar-button.button, .osd .scale-popup .header-bar .titlebutton.button, .header-bar .osd .scale-popup .titlebutton.button,
.osd .scale-popup .titlebar .titlebutton.button,
.titlebar .osd .scale-popup .titlebutton.button {