From c41294e2be202d2ac968166c8153a44874081760 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Wed, 12 Oct 2016 19:30:30 +0200 Subject: [PATCH] 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 1e56e5a508..010b23dadc 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -4273,8 +4273,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; caret-color: $drop_target_color; diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index fd14f42268..1ff6188827 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -4533,8 +4533,8 @@ button.circular { color: #919494; 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; caret-color: #4e9a06; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index f1e0022b07..38f669825c 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -4564,8 +4564,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; caret-color: #4e9a06; }