Skip to content

Commit

Permalink
Fix drag highlighting issue (#24)
Browse files Browse the repository at this point in the history
  • Loading branch information
@EliverLara
EliverLara committed Aug 10, 2019
1 parent 018525a commit 36e32bc
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 26 deletions.
2 changes: 1 addition & 1 deletion gtk-3.0/_colors.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,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: $teal;

// Infobar colors
$info_color: $lime;
Expand Down
34 changes: 22 additions & 12 deletions gtk-3.0/gtk-dark.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,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: #a3be8c;
border-color: #a3be8c;
box-shadow: inset 0 0 0 1px #a3be8c; }

row:selected
button.flat:not(:active):not(:checked):not(:hover):not(disabled) {
Expand Down Expand Up @@ -1571,11 +1571,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 #232831, inset 0 0 0 1px #4e9a06; }
border-color: #a3be8c;
box-shadow: inset 0 0 0 2px #232831, inset 0 0 0 1px #a3be8c; }
colorswatch:drop(active).dark overlay {
border-color: #4e9a06;
box-shadow: inset 0 0 0 2px #232831, inset 0 0 0 1px #4e9a06; }
border-color: #a3be8c;
box-shadow: inset 0 0 0 2px #232831, inset 0 0 0 1px #a3be8c; }

colorswatch overlay {
box-shadow: inset 0 3px 2px -2px rgba(0, 0, 0, 0.5);
Expand Down Expand Up @@ -1804,8 +1804,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: #a3be8c;
box-shadow: inset 0 0 0 1px #a3be8c; }
.osd spinbutton:not(.vertical), .osd
entry {
color: #d8dee9;
Expand Down Expand Up @@ -1879,7 +1879,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: #a3be8c; }

.linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled),
.linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical >
Expand Down Expand Up @@ -1910,7 +1910,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: #a3be8c; }

.linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical),
.linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry,
Expand All @@ -1934,7 +1934,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: #a3be8c; }

treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) {
background-color: #3b4252;
Expand Down Expand Up @@ -4114,6 +4114,16 @@ placessidebar.sidebar {
placessidebar.sidebar row.sidebar-row:selected .sidebar-icon {
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 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: #ebcb8b; }
placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) {
box-shadow: inset 0 1px #a3be8c, inset 0 -1px #a3be8c; }
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: #a3be8c; }
placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected {
background: #a3be8c; }
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: #2e3440; }

placessidebar list {
background-color: transparent; }
Expand Down
34 changes: 22 additions & 12 deletions gtk-3.0/gtk.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,9 +396,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: #a3be8c;
border-color: #a3be8c;
box-shadow: inset 0 0 0 1px #a3be8c; }

row:selected
button.flat:not(:active):not(:checked):not(:hover):not(disabled) {
Expand Down Expand Up @@ -1571,11 +1571,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 #232831, inset 0 0 0 1px #4e9a06; }
border-color: #a3be8c;
box-shadow: inset 0 0 0 2px #232831, inset 0 0 0 1px #a3be8c; }
colorswatch:drop(active).dark overlay {
border-color: #4e9a06;
box-shadow: inset 0 0 0 2px #232831, inset 0 0 0 1px #4e9a06; }
border-color: #a3be8c;
box-shadow: inset 0 0 0 2px #232831, inset 0 0 0 1px #a3be8c; }

colorswatch overlay {
box-shadow: inset 0 3px 2px -2px rgba(0, 0, 0, 0.5);
Expand Down Expand Up @@ -1804,8 +1804,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: #a3be8c;
box-shadow: inset 0 0 0 1px #a3be8c; }
.osd spinbutton:not(.vertical), .osd
entry {
color: #d8dee9;
Expand Down Expand Up @@ -1879,7 +1879,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: #a3be8c; }

.linked.vertical > spinbutton:not(:disabled):not(.vertical) + entry:not(:disabled),
.linked.vertical > spinbutton:not(:disabled):not(.vertical) + spinbutton:not(:disabled):not(.vertical), .linked.vertical >
Expand Down Expand Up @@ -1910,7 +1910,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: #a3be8c; }

.linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + spinbutton:not(.vertical),
.linked.vertical > spinbutton:focus:not(:only-child):not(.vertical) + entry,
Expand All @@ -1934,7 +1934,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: #a3be8c; }

treeview entry:focus:dir(rtl), treeview entry:focus:dir(ltr) {
background-color: #3b4252;
Expand Down Expand Up @@ -4114,6 +4114,16 @@ placessidebar.sidebar {
placessidebar.sidebar row.sidebar-row:selected .sidebar-icon {
-gtk-icon-shadow: 0 1px rgba(255, 255, 255, 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: #ebcb8b; }
placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled) {
box-shadow: inset 0 1px #a3be8c, inset 0 -1px #a3be8c; }
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: #a3be8c; }
placessidebar.sidebar row.sidebar-row:drop(active):not(:disabled):selected {
background: #a3be8c; }
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: #2e3440; }

placessidebar list {
background-color: transparent; }
Expand Down
19 changes: 18 additions & 1 deletion gtk-3.0/widgets/_sidebar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,25 @@ placessidebar{
-gtk-icon-shadow: 0 1px transparentize(#fff, 0.2);
color: inherit;
}
}
}

&.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;
}
}
}
}
}
Expand Down

0 comments on commit 36e32bc

Please sign in to comment.