[gtk+/gtk-3-20] Adwaita: dodge drop active style for window and decoration nodes
- From: Lapo Calamandrei <lapo src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-3-20] Adwaita: dodge drop active style for window and decoration nodes
- Date: Wed, 12 Oct 2016 17:34:49 +0000 (UTC)
commit 793265e020366bcc11dc864090632ff87312bc98
Author: Lapo Calamandrei <calamandrei gmail com>
Date: Wed Oct 12 19:30:30 2016 +0200
Adwaita: dodge drop active style for window and decoration nodes
to hilight drop target there is a wildcard selector which turns
the border and shadow to green, this clearly shouldn't happen when
the whole window is a drop target.
gtk/theme/Adwaita/_common.scss | 4 ++--
gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++--
gtk/theme/Adwaita/gtk-contained.css | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index c80b121..46fe04c 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4266,8 +4266,8 @@ button.circular { // FIXME: aggregate to buttons
}
}
-*:drop(active):focus,
-*:drop(active) { // FIXME needs to be done widget by widget, this wildcard should really die
+:not(decoration):not(window):drop(active):focus,
+:not(decoration):not(window):drop(active) { // FIXME needs to be done widget by widget, this wildcard should
really die
border-color: $drop_target_color;
box-shadow: inset 0 0 0 1px $drop_target_color;
}
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 6640970..d9c9807 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4452,8 +4452,8 @@ button.circular {
color: #949796;
transition: 200ms ease-out; }
-*:drop(active):focus,
-*:drop(active) {
+:not(decoration):not(window):drop(active):focus,
+:not(decoration):not(window):drop(active) {
border-color: #4e9a06;
box-shadow: inset 0 0 0 1px #4e9a06; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 6b04973..bad674f 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4482,8 +4482,8 @@ button.circular {
color: #8b8e8f;
transition: 200ms ease-out; }
-*:drop(active):focus,
-*:drop(active) {
+:not(decoration):not(window):drop(active):focus,
+:not(decoration):not(window):drop(active) {
border-color: #4e9a06;
box-shadow: inset 0 0 0 1px #4e9a06; }
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]