mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-12 06:06:22 +01:00
Code Issues Projects Releases Wiki Activity

Accept richer text from remote statuses

Browse Source 
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
This commit is contained in:
Thibaut Girka 2019-04-17 14:23:36 +02:00 committed by ThibG
parent 91a74ea86b
commit 2e3640ecbb
2 changed files with 35 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/javascript/flavours/glitch/styles/components/status.scss
View File

@ -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;

11
app/lib/sanitize_config.rb
View File

@ -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: [