From a4ab165de74e77992bebd0e886bc6a1442da6b87 Mon Sep 17 00:00:00 2001 From: BrokenEagle Date: Sat, 4 Apr 2020 02:08:46 +0000 Subject: [PATCH] Add alignment attributes for embedded notes - justify-conent is for L-R alignment - align-items is for T-B alignment --- app/javascript/src/javascripts/notes.js | 2 +- app/logical/note_sanitizer.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/javascript/src/javascripts/notes.js b/app/javascript/src/javascripts/notes.js index 462a1f354..e9676493b 100644 --- a/app/javascript/src/javascripts/notes.js +++ b/app/javascript/src/javascripts/notes.js @@ -4,7 +4,7 @@ import Utility from './utility' let Note = { 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'], - 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) { if ($attribute_child.length === 0) { return ""; diff --git a/app/logical/note_sanitizer.rb b/app/logical/note_sanitizer.rb index ed319aa08..cbec0d61a 100644 --- a/app/logical/note_sanitizer.rb +++ b/app/logical/note_sanitizer.rb @@ -14,6 +14,7 @@ module NoteSanitizer } ALLOWED_PROPERTIES = %w( + align-items background background-color 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 @@ -29,6 +30,7 @@ module NoteSanitizer float font font-family font-size font-size-adjust font-style font-variant font-weight height width + justify-content letter-spacing line-height list-style list-style-position list-style-type