diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-17 14:23:36 +0200 |
|---|---|---|
| committer | ThibG <thib@sitedethib.com> | 2019-04-22 23:07:14 +0200 |
| commit | 2e3640ecbb9050405f9bcfefc9ae92ebbffd23cd (patch) | |
| tree | f4ee41c7b55cd1e3664e68239f04f8498734c442 /app | |
| parent | 91a74ea86bb0c5b0016012ad50231956ff26592c (diff) | |
Accept richer text from remote statuses
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5 HTML elements in remote statuses, add corresponding CSS.
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/status.scss | 29 | ||||
| -rw-r--r-- | app/lib/sanitize_config.rb | 11 |
2 files changed, 35 insertions, 5 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss index b73dd3d09..ce07bd64a 100644 --- a/app/javascript/flavours/glitch/styles/components/status.scss +++ b/app/javascript/flavours/glitch/styles/components/status.scss @@ -22,7 +22,7 @@ margin: -3px 0 0; } - p { + p, pre, blockquote { margin-bottom: 20px; white-space: pre-wrap; @@ -31,6 +31,33 @@ } } + h1, h2, h3, h4, h5 { + margin-top: 20px; + margin-bottom: 20px; + } + + h1, h2 { + font-weight: 500; + font-size: 18px; + } + + h2 { + font-size: 16px; + } + + blockquote { + margin-left: 20px; + color: $dark-text-color; + } + + b, strong { + font-weight: 500; + } + + em, i { + font-style: italic; + } + a { color: $secondary-text-color; text-decoration: none; diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb index 1bba4a5a6..7c376c412 100644 --- a/app/lib/sanitize_config.rb +++ b/app/lib/sanitize_config.rb @@ -20,11 +20,13 @@ class Sanitize end MASTODON_STRICT ||= freeze_config( - elements: %w(p br span a), + elements: %w(p br span a abbr del pre blockquote code b strong i em h1 h2 h3 h4 h5), attributes: { - 'a' => %w(href rel class), - 'span' => %w(class), + 'a' => %w(href rel class title), + 'span' => %w(class), + 'abbr' => %w(title), + 'blockquote' => %w(cite), }, add_attributes: { @@ -35,7 +37,8 @@ class Sanitize }, protocols: { - 'a' => { 'href' => HTTP_PROTOCOLS }, + 'a' => { 'href' => HTTP_PROTOCOLS }, + 'blockquote' => { 'cite' => HTTP_PROTOCOLS }, }, transformers: [ |