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

Add alignment attributes for embedded notes

Browse Source 
- justify-conent is for L-R alignment
- align-items is for T-B alignment
This commit is contained in:
BrokenEagle
2020-04-04 02:08:46 +00:00
parent 91e5ed67b7
commit a4ab165de7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@ import Utility from './utility'
let Note = { let Note = {
HIDE_DELAY: 250, HIDE_DELAY: 250,
NORMALIZE_ATTRIBUTES: ['letter-spacing', 'line-height', 'margin-left', 'margin-right', 'margin-top', 'margin-bottom', 'padding-left', 'padding-right', 'padding-top', 'padding-bottom'], NORMALIZE_ATTRIBUTES: ['letter-spacing', 'line-height', 'margin-left', 'margin-right', 'margin-top', 'margin-bottom', 'padding-left', 'padding-right', 'padding-top', 'padding-bottom'],
COPY_ATTRIBUTES: ['background-color', 'border-radius', 'transform'], COPY_ATTRIBUTES: ['background-color', 'border-radius', 'transform', 'justify-content', 'align-items'],
permitted_style_values: function(attribute, $attribute_child) { permitted_style_values: function(attribute, $attribute_child) {
if ($attribute_child.length === 0) { if ($attribute_child.length === 0) {
return ""; return "";

2
app/logical/note_sanitizer.rb
View File

@@ -14,6 +14,7 @@ module NoteSanitizer
} }
ALLOWED_PROPERTIES = %w( ALLOWED_PROPERTIES = %w(
align-items
background background-color background background-color
border border-color border-image border-radius border-style border-width border border-color border-image border-radius border-style border-width
border-bottom border-bottom-color border-bottom-left-radius border-bottom-right-radius border-bottom-style border-bottom-width border-bottom border-bottom-color border-bottom-left-radius border-bottom-right-radius border-bottom-style border-bottom-width
@@ -29,6 +30,7 @@ module NoteSanitizer
float float
font font-family font-size font-size-adjust font-style font-variant font-weight font font-family font-size font-size-adjust font-style font-variant font-weight
height width height width
justify-content
letter-spacing letter-spacing
line-height line-height
list-style list-style-position list-style-type list-style list-style-position list-style-type