From d678eb920f9b2c581475f1be4b9d1581ca64fa57 Mon Sep 17 00:00:00 2001 From: negue Date: Thu, 29 Oct 2020 23:50:29 +0100 Subject: [PATCH] Fix Tasks styles (#12700) * re-add previous markdown h3/h4 styles - remove double transition properties * fix more heading styles * fix markdown h3 / tasktitle h3 --- website/client/src/assets/scss/markdown.scss | 34 +++++++++++++++---- .../client/src/assets/scss/typography.scss | 12 +++---- website/client/src/components/tasks/task.vue | 12 ++----- 3 files changed, 34 insertions(+), 24 deletions(-) diff --git a/website/client/src/assets/scss/markdown.scss b/website/client/src/assets/scss/markdown.scss index 249423875b..c1e517ed78 100644 --- a/website/client/src/assets/scss/markdown.scss +++ b/website/client/src/assets/scss/markdown.scss @@ -1,32 +1,52 @@ +@mixin h3Markdown { + font-family: 'Roboto Condensed', sans-serif; + font-size: 16px; + margin-bottom: 4px; + + line-height: 1.25; + margin-top: 6px; + color: $gray-10; + + font-weight: normal; +} + +// task titles are h3 by default +h3.markdown { + @include h3Markdown; +} + .markdown { p { margin-bottom: 8px; } h1 { + font-size: 24px; + line-height: 1.67; margin-bottom: 10px; margin-top: 14px; - line-height: 1.17; } h2 { margin-bottom: 6px; margin-top: 10px; + font-size: 20px; + line-height: 1.4; } h3 { - margin-bottom: 4px; - margin-top: 6px; - color: $gray-10; + @include h3Markdown; } - h1, h2, h3 { + h1, h2, h3, h4 { font-weight: normal; } h4 { - font-family: 'Roboto', sans-serif; - font-weight: bold; + font-family: 'Roboto Condensed', sans-serif; + font-size: 14px; + line-height: 1.43; + color: $gray-10; } a { diff --git a/website/client/src/assets/scss/typography.scss b/website/client/src/assets/scss/typography.scss index 30474404ed..f4b3306baf 100644 --- a/website/client/src/assets/scss/typography.scss +++ b/website/client/src/assets/scss/typography.scss @@ -52,10 +52,6 @@ h1, h2, h5, h6 { color: $gray-10; } -h3, h4 { - font-weight: bold; -} - h1 { font-size: 24px; line-height: 1.67; @@ -68,15 +64,17 @@ h2 { margin-bottom: 16px; } -h3 { +h3, h4 { + font-weight: bold; font-size: 0.875rem; line-height: 1.71; +} + +h3 { color: $gray-10; } h4 { - font-size: 0.875rem; - line-height: 1.71; color: $gray-100; } diff --git a/website/client/src/components/tasks/task.vue b/website/client/src/components/tasks/task.vue index 4ddc668f2d..266e3c084a 100644 --- a/website/client/src/components/tasks/task.vue +++ b/website/client/src/components/tasks/task.vue @@ -104,7 +104,7 @@