about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-04-21 22:04:19 +0200
committerThibG <thib@sitedethib.com>2019-04-22 23:07:14 +0200
commit27e8354914cb9f6725c911d5825399fc265852fe (patch)
treef9b9b702b51bf393d472176558185056edee6d31 /app
parent659f972bed63d9e8f18791ba4e0f779169f5fb4e (diff)
Add support for lists in statuses
Diffstat (limited to 'app')
-rw-r--r--app/javascript/flavours/glitch/styles/components/status.scss12
-rw-r--r--app/lib/sanitize_config.rb2
2 files changed, 13 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index 91467c886..c09e3398d 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -58,6 +58,18 @@
     em, i {
       font-style: italic;
     }
+
+    ul, ol {
+      margin-left: 1em;
+    }
+
+    ul {
+      list-style-type: disc;
+    }
+
+    ol {
+      list-style-type: decimal;
+    }
   }
 
   a {
diff --git a/app/lib/sanitize_config.rb b/app/lib/sanitize_config.rb
index 7c376c412..0a87bf6df 100644
--- a/app/lib/sanitize_config.rb
+++ b/app/lib/sanitize_config.rb
@@ -20,7 +20,7 @@ class Sanitize
     end
 
     MASTODON_STRICT ||= freeze_config(
-      elements: %w(p br span a abbr del pre blockquote code b strong i em h1 h2 h3 h4 h5),
+      elements: %w(p br span a abbr del pre blockquote code b strong i em h1 h2 h3 h4 h5 ul ol li),
 
       attributes: {
         'a'          => %w(href rel class title),