From 4bab7d7640a72ffeb04c104a93ad6d3d5700c712 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 13 May 2019 15:06:09 +0200 Subject: Fix rich text style in reply indicator --- .../glitch/styles/components/composer.scss | 65 +++++++++++++++++++++- 1 file changed, 63 insertions(+), 2 deletions(-) (limited to 'app/javascript/flavours') 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 { -- cgit