From 870447446dda8fa8aee1d059a36559489ae8730c Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Thu, 2 Mar 2017 12:39:02 +0100 Subject: [PATCH] Adwaita: style selectionmode checks for flowbox tiles - continue being asset based rather than drawn by CSS - using node 'check' rather than style '.check' https://bugzilla.gnome.org/show_bug.cgi?id=779074 --- gtk/theme/Adwaita/_common.scss | 8 ++- gtk/theme/Adwaita/gtk-contained-dark.css | 80 +++++++++++++++++++----- gtk/theme/Adwaita/gtk-contained.css | 80 +++++++++++++++++++----- 3 files changed, 135 insertions(+), 33 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index eade9e297f..36a3d26b07 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2592,10 +2592,16 @@ switch { (':checked:hover', '-checked-hover-selectionmode'), (':checked:active', '-checked-active-selectionmode'), (':backdrop:checked', '-checked-backdrop-selectionmode') { - .view.content-view.check#{$s}:not(list) { + .view.content-view.check#{$s}:not(list), + .content-view .tile check#{$s}:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}.png"), url("assets/checkbox#{$as}@2.png")); background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 71eb863d1c..cb8f06b9e6 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -2800,45 +2800,93 @@ switch { /************************* * Check and Radio items * *************************/ -.view.content-view.check:not(list), iconview.content-view.check:not(list) { +.view.content-view.check:not(list), iconview.content-view.check:not(list), +.content-view .tile check:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list) { +.view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list), +.content-view .tile check:hover:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:active:not(list), iconview.content-view.check:active:not(list) { +.view.content-view.check:active:not(list), iconview.content-view.check:active:not(list), +.content-view .tile check:active:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list) { +.view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list), +.content-view .tile check:backdrop:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list) { +.view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list), +.content-view .tile check:checked:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list) { +.view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list), +.content-view .tile check:checked:hover:not(list) { -gtk-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; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list) { +.view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list), +.content-view .tile check:checked:active:not(list) { -gtk-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; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list) { +.view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list), +.content-view .tile check:backdrop:checked:not(list) { -gtk-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; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } checkbutton.text-button, radiobutton.text-button { padding: 2px 0; diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index de9c23f5ab..51447f86de 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -2827,45 +2827,93 @@ switch { /************************* * Check and Radio items * *************************/ -.view.content-view.check:not(list), iconview.content-view.check:not(list) { +.view.content-view.check:not(list), iconview.content-view.check:not(list), +.content-view .tile check:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list) { +.view.content-view.check:hover:not(list), iconview.content-view.check:hover:not(list), +.content-view .tile check:hover:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-hover-selectionmode.png"), url("assets/checkbox-hover-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:active:not(list), iconview.content-view.check:active:not(list) { +.view.content-view.check:active:not(list), iconview.content-view.check:active:not(list), +.content-view .tile check:active:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-active-selectionmode.png"), url("assets/checkbox-active-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list) { +.view.content-view.check:backdrop:not(list), iconview.content-view.check:backdrop:not(list), +.content-view .tile check:backdrop:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-backdrop-selectionmode.png"), url("assets/checkbox-backdrop-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list) { +.view.content-view.check:checked:not(list), iconview.content-view.check:checked:not(list), +.content-view .tile check:checked:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-selectionmode.png"), url("assets/checkbox-checked-selectionmode@2.png")); - background-color: transparent; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list) { +.view.content-view.check:checked:hover:not(list), iconview.content-view.check:checked:hover:not(list), +.content-view .tile check:checked:hover:not(list) { -gtk-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; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list) { +.view.content-view.check:checked:active:not(list), iconview.content-view.check:checked:active:not(list), +.content-view .tile check:checked:active:not(list) { -gtk-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; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } -.view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list) { +.view.content-view.check:backdrop:checked:not(list), iconview.content-view.check:backdrop:checked:not(list), +.content-view .tile check:backdrop:checked:not(list) { -gtk-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; } + background-color: transparent; + min-width: 40px; + min-height: 40px; + background-image: none; + transition: none; + box-shadow: none; } checkbutton.text-button, radiobutton.text-button { padding: 2px 0;