jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4763 from BrokenEagle/embedded-notes-stack-order

Browse Source 
Add ability to determine stack order of embedded notes
This commit is contained in:
evazion
2021-03-18 21:34:36 -05:00
committed by GitHub
parent 6267426013 79a70083ef
commit fb7ffafe0a
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/javascript/src/javascripts/notes.js
View File

@@ -10,6 +10,7 @@ class Note {
static HIDE_DELAY = 250; static HIDE_DELAY = 250;
static NORMALIZE_ATTRIBUTES = ['letter-spacing', 'line-height', 'margin-left', 'margin-right', 'margin-top', 'margin-bottom', 'padding-left', 'padding-right', 'padding-top', 'padding-bottom']; static NORMALIZE_ATTRIBUTES = ['letter-spacing', 'line-height', 'margin-left', 'margin-right', 'margin-top', 'margin-bottom', 'padding-left', 'padding-right', 'padding-top', 'padding-bottom'];
static COPY_ATTRIBUTES = ['background-color', 'border-radius', 'transform', 'justify-content', 'align-items']; static COPY_ATTRIBUTES = ['background-color', 'border-radius', 'transform', 'justify-content', 'align-items'];
static BOX_LEVEL_CLASSES = Array.from({length: 5}, (_, i) => 'level-' + (i + 1));
static RESIZE_HANDLES = "se, nw"; static RESIZE_HANDLES = "se, nw";
// Notes must be at least 10x10 in size so they're big enough to drag and resize. // Notes must be at least 10x10 in size so they're big enough to drag and resize.
@@ -168,6 +169,12 @@ class Note {
} else { } else {
this.note.has_rotation = false; this.note.has_rotation = false;
} }
$note_box.removeClass(Note.BOX_LEVEL_CLASSES);
const level_class = ($attribute_child.attr('class') || "").split(/\s+/).filter((klass) => Note.BOX_LEVEL_CLASSES.includes(klass))[0];
if (level_class) {
$note_box.addClass(level_class);
}
} }
permitted_style_values(attribute, $attribute_child) { permitted_style_values(attribute, $attribute_child) {

7
app/javascript/src/styles/specific/notes.scss → app/javascript/src/styles/specific/notes.scss.erb
View File

@@ -148,6 +148,13 @@
border: 1px solid var(--movable-note-box-border-color); border: 1px solid var(--movable-note-box-border-color);
} }
<% for i in 1..5 do %>
<%# Selector order is deliberate as placing the not after the level consistently caused segmentaion faults for unknown reasons. %>
&:not(:hover).level-<%= i %> {
z-index: <%= 100 + i %>;
}
<% end %>
&:not(:hover) div.ui-resizable-handle { &:not(:hover) div.ui-resizable-handle {
display: none !important; display: none !important;
} }