From 97618727ad6221954a7605c8a528db9cfd5cc6f7 Mon Sep 17 00:00:00 2001 From: EliverLara Date: Fri, 16 Aug 2019 11:25:47 -0500 Subject: [PATCH] Fix drag highlighting issue --- gtk-3.0/_colors.scss | 2 +- gtk-3.0/gtk-dark.css | 34 ++++++++++++++++++++++------------ gtk-3.0/gtk.css | 34 ++++++++++++++++++++++------------ gtk-3.0/widgets/_sidebar.scss | 18 ++++++++++++++++++ 4 files changed, 63 insertions(+), 25 deletions(-) diff --git a/gtk-3.0/_colors.scss b/gtk-3.0/_colors.scss index 5283ddc..cb0fdd2 100755 --- a/gtk-3.0/_colors.scss +++ b/gtk-3.0/_colors.scss @@ -71,7 +71,7 @@ $drop_target_color: #a1ce4b; $text_shadow_color: if($variant == 'dark', $shadow_color, transparentize(white, 0.9)); $icon_shadow_color: $text_shadow_color; -$drop_target_color: #4e9a06; +$drop_target_color: $lime; // Infobar colors $info_color: $lime; diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css index cfc5484..690ecbf 100755 --- a/gtk-3.0/gtk-dark.css +++ b/gtk-3.0/gtk-dark.css @@ -403,9 +403,9 @@ button { padding-right: 8px; } combobox:drop(active) button.combo, notebook > header > tabs > arrow:drop(active), button:drop(active) { - color: #4e9a06; - border-color: #4e9a06; - box-shadow: inset 0 0 0 1px #4e9a06; } + color: #CAE7B9; + border-color: #CAE7B9; + box-shadow: inset 0 0 0 1px #CAE7B9; } row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled) { @@ -1602,11 +1602,11 @@ colorswatch.light overlay { colorswatch:drop(active) { box-shadow: none; } colorswatch:drop(active).light overlay { - border-color: #4e9a06; - box-shadow: inset 0 0 0 2px rgba(12, 14, 21, 0.8), inset 0 0 0 1px #4e9a06; } + border-color: #CAE7B9; + box-shadow: inset 0 0 0 2px rgba(12, 14, 21, 0.8), inset 0 0 0 1px #CAE7B9; } colorswatch:drop(active).dark overlay { - border-color: #4e9a06; - box-shadow: inset 0 0 0 2px rgba(12, 14, 21, 0.8), inset 0 0 0 1px #4e9a06; } + border-color: #CAE7B9; + box-shadow: inset 0 0 0 2px rgba(12, 14, 21, 0.8), inset 0 0 0 1px #CAE7B9; } colorswatch overlay { box-shadow: inset 0 3px 2px -2px rgba(0, 0, 0, 0.5); @@ -1835,8 +1835,8 @@ entry { spinbutton:drop(active):focus:not(.vertical), spinbutton:drop(active):not(.vertical), entry:drop(active):focus, entry:drop(active) { - border-color: #4e9a06; - box-shadow: inset 0 0 0 1px #4e9a06; } + border-color: #CAE7B9; + box-shadow: inset 0 0 0 1px #CAE7B9; } .osd spinbutton:not(.vertical), .osd entry { color: white; @@ -1910,7 +1910,7 @@ entry:drop(active) + button, entry:drop(active) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + entry, .linked:not(.vertical) > entry:drop(active) + entry { - border-left-color: #4e9a06; } + border-left-color: #CAE7B9; } .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical > @@ -1941,7 +1941,7 @@ entry + entry:focus:not(:only-child) { .linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry + spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > entry + entry:drop(active):not(:only-child) { - border-top-color: #4e9a06; } + border-top-color: #CAE7B9; } .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, @@ -1965,7 +1965,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: #4e9a06; } + border-top-color: #CAE7B9; } treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) { background-color: #1c2124; @@ -4094,6 +4094,16 @@ placessidebar.sidebar { placessidebar.sidebar row.sidebar-row:selected .sidebar-icon { -gtk-icon-shadow: 0 1px rgba(247, 247, 247, 0.8); color: inherit; } + placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row, placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row label, placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row .sidebar-icon { + color: #E1DD8F; } + placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) { + box-shadow: inset 0 1px #CAE7B9, inset 0 -1px #CAE7B9; } + placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled), placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) label, placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) image { + color: #CAE7B9; } + placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected { + background: #CAE7B9; } + placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected, placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected label, placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected image { + color: #f7f7f7; } placessidebar list { background-color: transparent; } diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css index cfc5484..690ecbf 100755 --- a/gtk-3.0/gtk.css +++ b/gtk-3.0/gtk.css @@ -403,9 +403,9 @@ button { padding-right: 8px; } combobox:drop(active) button.combo, notebook > header > tabs > arrow:drop(active), button:drop(active) { - color: #4e9a06; - border-color: #4e9a06; - box-shadow: inset 0 0 0 1px #4e9a06; } + color: #CAE7B9; + border-color: #CAE7B9; + box-shadow: inset 0 0 0 1px #CAE7B9; } row:selected button.flat:not(:active):not(:checked):not(:hover):not(disabled) { @@ -1602,11 +1602,11 @@ colorswatch.light overlay { colorswatch:drop(active) { box-shadow: none; } colorswatch:drop(active).light overlay { - border-color: #4e9a06; - box-shadow: inset 0 0 0 2px rgba(12, 14, 21, 0.8), inset 0 0 0 1px #4e9a06; } + border-color: #CAE7B9; + box-shadow: inset 0 0 0 2px rgba(12, 14, 21, 0.8), inset 0 0 0 1px #CAE7B9; } colorswatch:drop(active).dark overlay { - border-color: #4e9a06; - box-shadow: inset 0 0 0 2px rgba(12, 14, 21, 0.8), inset 0 0 0 1px #4e9a06; } + border-color: #CAE7B9; + box-shadow: inset 0 0 0 2px rgba(12, 14, 21, 0.8), inset 0 0 0 1px #CAE7B9; } colorswatch overlay { box-shadow: inset 0 3px 2px -2px rgba(0, 0, 0, 0.5); @@ -1835,8 +1835,8 @@ entry { spinbutton:drop(active):focus:not(.vertical), spinbutton:drop(active):not(.vertical), entry:drop(active):focus, entry:drop(active) { - border-color: #4e9a06; - box-shadow: inset 0 0 0 1px #4e9a06; } + border-color: #CAE7B9; + box-shadow: inset 0 0 0 1px #CAE7B9; } .osd spinbutton:not(.vertical), .osd entry { color: white; @@ -1910,7 +1910,7 @@ entry:drop(active) + button, entry:drop(active) + combobox > box > button.combo, .linked:not(.vertical) > spinbutton:drop(active):not(.vertical) + entry, .linked:not(.vertical) > entry:drop(active) + entry { - border-left-color: #4e9a06; } + border-left-color: #CAE7B9; } .linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled), .linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical > @@ -1941,7 +1941,7 @@ entry + entry:focus:not(:only-child) { .linked.vertical > spinbutton:not(.vertical) + entry:drop(active):not(:only-child), .linked.vertical > entry + spinbutton:drop(active):not(:only-child):not(.vertical), .linked.vertical > entry + entry:drop(active):not(:only-child) { - border-top-color: #4e9a06; } + border-top-color: #CAE7B9; } .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical), .linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry, @@ -1965,7 +1965,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: #4e9a06; } + border-top-color: #CAE7B9; } treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) { background-color: #1c2124; @@ -4094,6 +4094,16 @@ placessidebar.sidebar { placessidebar.sidebar row.sidebar-row:selected .sidebar-icon { -gtk-icon-shadow: 0 1px rgba(247, 247, 247, 0.8); color: inherit; } + placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row, placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row label, placessidebar.sidebar row.sidebar-row.sidebar-new-bookmark-row .sidebar-icon { + color: #E1DD8F; } + placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) { + box-shadow: inset 0 1px #CAE7B9, inset 0 -1px #CAE7B9; } + placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled), placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) label, placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) image { + color: #CAE7B9; } + placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected { + background: #CAE7B9; } + placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected, placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected label, placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected image { + color: #f7f7f7; } placessidebar list { background-color: transparent; } diff --git a/gtk-3.0/widgets/_sidebar.scss b/gtk-3.0/widgets/_sidebar.scss index 6841f43..9080693 100644 --- a/gtk-3.0/widgets/_sidebar.scss +++ b/gtk-3.0/widgets/_sidebar.scss @@ -178,6 +178,24 @@ placessidebar{ } } + &.sidebar-new-bookmark-row { + &, label, .sidebar-icon { + color: $yellow; + } + } + + &:drop(active):not(:disabled) { + &, label, image { color: $drop_target_color; } + + box-shadow: inset 0 1px $drop_target_color, + inset 0 -1px $drop_target_color; + + &:selected { + &, label, image { color: $selected_fg_color; } + background: $drop_target_color; + } + } + } } }