AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Adwaita: placessidebar dnd fixes

Browse Source
This commit is contained in:
Lapo Calamandrei 2016-03-14 18:33:40 +01:00
parent 5ac848d229
commit 8b505d570e
3 changed files with 46 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/theme/Adwaita/_common.scss
View File

@ -3645,18 +3645,25 @@ placessidebar {
&:not(:hover):not(:active), &:not(:hover):not(:active),
&:backdrop { > image { opacity: $_placesidebar_icons_opacity; }} &:backdrop { > image { opacity: $_placesidebar_icons_opacity; }}
} }
}
// in the sidebar case it makes no sense to click the selected row // in the sidebar case it makes no sense to click the selected row
row:selected:active { box-shadow: none; } &:selected:active { box-shadow: none; }
// looks like the label doesn't get all the states so work around &.sidebar-placeholder-row {
row:selected:disabled label { @extend %selected_items:disabled; } padding: 0 8px;
row:selected:backdrop:disabled label { @extend %selected_items:backdrop:disabled; } min-height: 2px;
background-image: image($drop_target_color);
background-clip: content-box;
}
row.sidebar-placeholder-row { border: solid 1px $selected_bg_color; } &.sidebar-new-bookmark-row { color: $selected_bg_color; }
row.sidebar-new-bookmark-row { color: $selected_bg_color; } &:drop(active):not(:disabled) {
color: $drop_target_color;
box-shadow: inset 0 1px $drop_target_color,
inset 0 -1px $drop_target_color;
}
}
} }
placesview { placesview {

18
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -3695,12 +3695,18 @@ placessidebar row {
-gtk-outline-radius: 100%; } -gtk-outline-radius: 100%; }
button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image { button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image {
opacity: 0.7; } opacity: 0.7; }
placessidebar row:selected:active { placessidebar row:selected:active {
box-shadow: none; } box-shadow: none; }
placessidebar row.sidebar-placeholder-row { placessidebar row.sidebar-placeholder-row {
border: solid 1px #215d9c; } padding: 0 8px;
placessidebar row.sidebar-new-bookmark-row { min-height: 2px;
background-image: image(black);
background-clip: content-box; }
placessidebar row.sidebar-new-bookmark-row {
color: #215d9c; } color: #215d9c; }
placessidebar row:drop(active):not(:disabled) {
color: black;
box-shadow: inset 0 1px black, inset 0 -1px black; }
placesview .server-list-button > image { placesview .server-list-button > image {
transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
@ -4059,7 +4065,7 @@ popover.background radiobutton:selected,
label selection:disabled, spinbutton:not(.vertical) selection:disabled, label selection:disabled, spinbutton:not(.vertical) selection:disabled,
entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected, entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected,
popover.background radiobutton:disabled:selected, popover.background radiobutton:disabled:selected,
.menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label { .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected {
color: #90aece; } color: #90aece; }
iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected,
iconview text:backdrop:selected:focus, iconview text:backdrop:selected:focus,
@ -4081,7 +4087,7 @@ popover.background radiobutton:selected,
label selection:backdrop:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, label selection:backdrop:disabled, spinbutton:not(.vertical) selection:backdrop:disabled,
entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected, entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected,
popover.background radiobutton:backdrop:disabled:selected, popover.background radiobutton:backdrop:disabled:selected,
.menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected, placessidebar row:selected:disabled label:backdrop, placessidebar row:selected:backdrop:disabled label { .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected {
color: #648eba; } color: #648eba; }
.monospace { .monospace {

18
gtk/theme/Adwaita/gtk-contained.css
View File

@ -3728,12 +3728,18 @@ placessidebar row {
-gtk-outline-radius: 100%; } -gtk-outline-radius: 100%; }
button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image { button.sidebar-button:not(:hover):not(:active) > image, button.sidebar-button:backdrop > image {
opacity: 0.7; } opacity: 0.7; }
placessidebar row:selected:active { placessidebar row:selected:active {
box-shadow: none; } box-shadow: none; }
placessidebar row.sidebar-placeholder-row { placessidebar row.sidebar-placeholder-row {
border: solid 1px #4a90d9; } padding: 0 8px;
placessidebar row.sidebar-new-bookmark-row { min-height: 2px;
background-image: image(black);
background-clip: content-box; }
placessidebar row.sidebar-new-bookmark-row {
color: #4a90d9; } color: #4a90d9; }
placessidebar row:drop(active):not(:disabled) {
color: black;
box-shadow: inset 0 1px black, inset 0 -1px black; }
placesview .server-list-button > image { placesview .server-list-button > image {
transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition: 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
@ -4093,7 +4099,7 @@ popover.background radiobutton:selected,
label selection:disabled, spinbutton:not(.vertical) selection:disabled, label selection:disabled, spinbutton:not(.vertical) selection:disabled,
entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected, entry selection:disabled, modelbutton.flat:disabled:selected, popover.background checkbutton:disabled:selected,
popover.background radiobutton:disabled:selected, popover.background radiobutton:disabled:selected,
.menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected, placessidebar row:selected:disabled label { .menuitem.button.flat:disabled:selected, row:disabled:selected, calendar:disabled:selected, .sidebar :disabled:selected {
color: #a5c8ec; } color: #a5c8ec; }
iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected, iconview:backdrop:selected:focus, .view:backdrop:selected, iconview:backdrop:selected,
iconview text:backdrop:selected:focus, iconview text:backdrop:selected:focus,
@ -4115,7 +4121,7 @@ popover.background radiobutton:selected,
label selection:backdrop:disabled, spinbutton:not(.vertical) selection:backdrop:disabled, label selection:backdrop:disabled, spinbutton:not(.vertical) selection:backdrop:disabled,
entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected, entry selection:backdrop:disabled, modelbutton.flat:backdrop:disabled:selected, popover.background checkbutton:backdrop:disabled:selected,
popover.background radiobutton:backdrop:disabled:selected, popover.background radiobutton:backdrop:disabled:selected,
.menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected, placessidebar row:selected:disabled label:backdrop, placessidebar row:selected:backdrop:disabled label { .menuitem.button.flat:backdrop:disabled:selected, row:backdrop:disabled:selected, calendar:backdrop:disabled:selected, .sidebar :backdrop:disabled:selected {
color: #80b1e4; } color: #80b1e4; }
.monospace { .monospace {