about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-05-13 15:06:09 +0200
committerThibG <thib@sitedethib.com>2019-05-13 17:13:02 +0200
commit4bab7d7640a72ffeb04c104a93ad6d3d5700c712 (patch)
tree9e0e00e3e2b19b86eec6b5b37e4de19776ddf1e2 /app
parent87d16698c27b80e3bb8b20f5ff20ee6a07655fab (diff)
Fix rich text style in reply indicator
Diffstat (limited to 'app')
-rw-r--r--app/javascript/flavours/glitch/styles/components/composer.scss65
1 files changed, 63 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss
index bb333d35f..ba517a2ab 100644
--- a/app/javascript/flavours/glitch/styles/components/composer.scss
+++ b/app/javascript/flavours/glitch/styles/components/composer.scss
@@ -124,10 +124,71 @@
     white-space: pre-wrap;
     padding-top: 5px;
 
-    p {
+    p, pre, blockquote {
       margin-bottom: 20px;
+      white-space: pre-wrap;
 
-      &:last-child { margin-bottom: 0 }
+      &:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    h1, h2, h3, h4, h5 {
+      margin-top: 20px;
+      margin-bottom: 20px;
+    }
+
+    h1, h2 {
+      font-weight: 700;
+      font-size: 18px;
+    }
+
+    h2 {
+      font-size: 16px;
+    }
+
+    h3, h4, h5 {
+      font-weight: 500;
+    }
+
+    blockquote {
+      padding-left: 10px;
+      border-left: 3px solid $inverted-text-color;
+      color: $inverted-text-color;
+      white-space: normal;
+
+      p:last-child {
+        margin-bottom: 0;
+      }
+    }
+
+    b, strong {
+      font-weight: 700;
+    }
+
+    em, i {
+      font-style: italic;
+    }
+
+    sub {
+      font-size: smaller;
+      text-align: sub;
+    }
+
+    ul, ol {
+      margin-left: 1em;
+
+      p {
+        margin: 0;
+      }
+    }
+
+    ul {
+      list-style-type: disc;
+    }
+
+    ol {
+      list-style-type: decimal;
     }
 
     a {