From baab1ebcc14a6c717da3f09cb87eeee697e25ab1 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Mon, 14 Mar 2016 18:46:56 +0100 Subject: [PATCH] Adwaita: use a green (Tango Chameleon 3) for drag hilight --- gtk/theme/Adwaita/_colors.scss | 2 +- gtk/theme/Adwaita/_common.scss | 6 ++++++ gtk/theme/Adwaita/gtk-contained-dark.css | 26 ++++++++++++++---------- gtk/theme/Adwaita/gtk-contained.css | 26 ++++++++++++++---------- 4 files changed, 37 insertions(+), 23 deletions(-) diff --git a/gtk/theme/Adwaita/_colors.scss b/gtk/theme/Adwaita/_colors.scss index 9d3882a694..13322cae2b 100644 --- a/gtk/theme/Adwaita/_colors.scss +++ b/gtk/theme/Adwaita/_colors.scss @@ -44,7 +44,7 @@ $base_hover_color: transparentize($fg_color, 0.95); $tooltip_borders_color: transparentize(white, 0.9); $shadow_color: transparentize(black, 0.9); -$drop_target_color: black; +$drop_target_color: #4e9a06; //insensitive state derived colors $insensitive_fg_color: mix($fg_color, $bg_color, 50%); diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index c54dd44ecf..5c521dfc7f 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -499,6 +499,7 @@ button { } &:drop(active) { + color: $drop_target_color; border-color: $drop_target_color; box-shadow: inset 0 0 0 1px $drop_target_color; } @@ -3662,6 +3663,11 @@ placessidebar { color: $drop_target_color; box-shadow: inset 0 1px $drop_target_color, inset 0 -1px $drop_target_color; + + &:selected { + color: $selected_fg_color; + background-color: $drop_target_color; + } } } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 7db7eb9700..1b8c765de1 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -122,7 +122,7 @@ textview { textview:drop(active), textview:drop(active) > text { box-shadow: none; } textview:drop(active) > text { - background-color: rgba(0, 0, 0, 0.1); } + background-color: rgba(78, 154, 6, 0.1); } popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd popover.background.osd, .app-notification, .app-notification.frame, .osd .scale-popup, .osd { @@ -280,8 +280,8 @@ entry { spinbutton:drop(active):focus:not(.vertical), spinbutton:drop(active):not(.vertical), entry:drop(active):focus, entry:drop(active) { - border-color: black; - box-shadow: inset 0 0 0 1px black; } + border-color: #4e9a06; + box-shadow: inset 0 0 0 1px #4e9a06; } .osd spinbutton:not(.vertical), .osd entry { background-color: #292929; @@ -348,7 +348,7 @@ entry:focus + combobox > box > button.combo { entry:drop(active) + entry, .linked:not(.vertical) > entry:drop(active) + button, .linked:not(.vertical) > entry:drop(active) + combobox > box > button.combo { - border-left-color: black; } + border-left-color: #4e9a06; } .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + entry:not(:disabled) { border-top-color: #252626; @@ -365,7 +365,7 @@ entry + entry:focus:not(:only-child) { border-top-color: #0f2b48; } .linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry + entry:drop(active):not(:only-child) { - border-top-color: black; } + border-top-color: #4e9a06; } .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > @@ -383,7 +383,7 @@ entry:drop(active):not(:only-child) + entry, entry:drop(active):not(:only-child) + button, .linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { - border-top-color: black; } + border-top-color: #4e9a06; } /*********** * Buttons * @@ -526,8 +526,9 @@ notebook > header > tabs > arrow, headerbar button.titlebutton, padding-right: 8px; } combobox:drop(active) button.combo, notebook > header > tabs > arrow:drop(active), headerbar button.titlebutton:drop(active), .titlebar button.titlebutton:drop(active), button:drop(active) { - border-color: black; - box-shadow: inset 0 0 0 1px black; } + color: #4e9a06; + border-color: #4e9a06; + box-shadow: inset 0 0 0 1px #4e9a06; } row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled), row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled) { color: #ffffff; border-color: transparent; } @@ -3700,13 +3701,16 @@ placessidebar row { placessidebar row.sidebar-placeholder-row { padding: 0 8px; min-height: 2px; - background-image: image(black); + background-image: image(#4e9a06); background-clip: content-box; } placessidebar row.sidebar-new-bookmark-row { color: #215d9c; } placessidebar row:drop(active):not(:disabled) { - color: black; - box-shadow: inset 0 1px black, inset 0 -1px black; } + color: #4e9a06; + box-shadow: inset 0 1px #4e9a06, inset 0 -1px #4e9a06; } + placessidebar row:drop(active):not(:disabled):selected { + color: #ffffff; + background-color: #4e9a06; } placesview .server-list-button > image { transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index b1630ea226..006cf088fa 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -122,7 +122,7 @@ textview { textview:drop(active), textview:drop(active) > text { box-shadow: none; } textview:drop(active) > text { - background-color: rgba(0, 0, 0, 0.1); } + background-color: rgba(78, 154, 6, 0.1); } popover.background.touch-selection, popover.background.magnifier, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.osd, .csd popover.background.osd, .app-notification, .app-notification.frame, .osd .scale-popup, .osd { @@ -280,8 +280,8 @@ entry { spinbutton:drop(active):focus:not(.vertical), spinbutton:drop(active):not(.vertical), entry:drop(active):focus, entry:drop(active) { - border-color: black; - box-shadow: inset 0 0 0 1px black; } + border-color: #4e9a06; + box-shadow: inset 0 0 0 1px #4e9a06; } .osd spinbutton:not(.vertical), .osd entry { background-color: #ffffff; @@ -348,7 +348,7 @@ entry:focus + combobox > box > button.combo { entry:drop(active) + entry, .linked:not(.vertical) > entry:drop(active) + button, .linked:not(.vertical) > entry:drop(active) + combobox > box > button.combo { - border-left-color: black; } + border-left-color: #4e9a06; } .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > entry:not(:disabled) + entry:not(:disabled) { border-top-color: #e2e2e0; @@ -365,7 +365,7 @@ entry + entry:focus:not(:only-child) { border-top-color: #4a90d9; } .linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry + entry:drop(active):not(:only-child) { - border-top-color: black; } + border-top-color: #4e9a06; } .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + button, .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + combobox > box > button.combo, .linked.vertical > @@ -383,7 +383,7 @@ entry:drop(active):not(:only-child) + entry, entry:drop(active):not(:only-child) + button, .linked.vertical > entry:drop(active):not(:only-child) + combobox > box > button.combo { - border-top-color: black; } + border-top-color: #4e9a06; } /*********** * Buttons * @@ -526,8 +526,9 @@ notebook > header > tabs > arrow, headerbar button.titlebutton, padding-right: 8px; } combobox:drop(active) button.combo, notebook > header > tabs > arrow:drop(active), headerbar button.titlebutton:drop(active), .titlebar button.titlebutton:drop(active), button:drop(active) { - border-color: black; - box-shadow: inset 0 0 0 1px black; } + color: #4e9a06; + border-color: #4e9a06; + box-shadow: inset 0 0 0 1px #4e9a06; } row:selected button { border-color: #184472; } row:selected button.sidebar-button:not(:active):not(:checked):not(:hover):not(disabled), row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled) { @@ -3733,13 +3734,16 @@ placessidebar row { placessidebar row.sidebar-placeholder-row { padding: 0 8px; min-height: 2px; - background-image: image(black); + background-image: image(#4e9a06); background-clip: content-box; } placessidebar row.sidebar-new-bookmark-row { color: #4a90d9; } placessidebar row:drop(active):not(:disabled) { - color: black; - box-shadow: inset 0 1px black, inset 0 -1px black; } + color: #4e9a06; + box-shadow: inset 0 1px #4e9a06, inset 0 -1px #4e9a06; } + placessidebar row:drop(active):not(:disabled):selected { + color: #ffffff; + background-color: #4e9a06; } placesview .server-list-button > image { transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);