From 09c1810f71fed44b49dd6d0ee92faf6128656b03 Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Tue, 23 Oct 2018 15:43:47 +0200 Subject: Headings standard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/apps.scss | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/core/css/apps.scss b/core/css/apps.scss index dc05d2b3fbb..954b08a114d 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -17,22 +17,33 @@ */ /* BASE STYLING ------------------------------------------------------------ */ - -h2, -h3, -h4 { +h1, +h2 { font-weight: bold; } +h1 { + font-size: 26px; + margin-bottom: 12px; + line-height: 40px; + color: var(--color-text-lighter); +} + h2 { font-size: 20px; margin-bottom: 12px; - line-height: 140%; + line-height: 30px; + color: var(--color-text-light); } h3 { - font-size: 15px; + font-size: 16px; margin: 12px 0; + color: var(--color-text-light); +} + +h4 { + font-size: 14px; } /* do not use italic typeface style, instead lighter color */ -- cgit v1.2.3 From f352f034a1e49a86273ca7e8b4082ede386a6108 Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Tue, 23 Oct 2018 15:50:59 +0200 Subject: Reverted standards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- settings/css/settings.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/settings/css/settings.scss b/settings/css/settings.scss index 8500d6a8353..b71177a41c0 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -224,7 +224,6 @@ select { flex-wrap: nowrap; justify-content: flex-start; width: 100%; - font-weight: 300; > label { white-space: nowrap; -- cgit v1.2.3 From 19a56d9e16f96d6bea5292bf8d2b1dc3a9727514 Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Tue, 23 Oct 2018 16:14:34 +0200 Subject: Cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/styles.scss | 1 - settings/css/settings.scss | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/core/css/styles.scss b/core/css/styles.scss index 6f65f00df19..643f0b681a0 100644 --- a/core/css/styles.scss +++ b/core/css/styles.scss @@ -221,7 +221,6 @@ body { } h2 { margin-bottom: 10px; - line-height: 150%; } [class^='icon-'], [class*='icon-'] { diff --git a/settings/css/settings.scss b/settings/css/settings.scss index b71177a41c0..a028a62d2be 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -104,11 +104,6 @@ input { display: inline-grid; grid-template-columns: 1fr; grid-template-rows: 1fr 1fr 1fr; - - /* Same font-weight exception as for .personal-settings-container */ - > div h3 { - font-weight: 300; - } } .personal-show-container { @@ -318,7 +313,7 @@ select { top: 44px; &.popovermenu { .menuitem { - // override h2 heading font size + // override h3 heading font size font-size: 12.8px; line-height: 1.6em; .menuitem-text-detail { -- cgit v1.2.3 From 371cf29f0c17aea6b86a0ffa3754a95427014571 Mon Sep 17 00:00:00 2001 From: "John Molakvoæ (skjnldsv)" Date: Sun, 28 Oct 2018 10:44:45 +0100 Subject: fixup! Cleanup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- core/css/apps.scss | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/core/css/apps.scss b/core/css/apps.scss index 954b08a114d..8b94d08ce2e 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -17,19 +17,9 @@ */ /* BASE STYLING ------------------------------------------------------------ */ -h1, +// no h1 allowed since h1 = logo h2 { font-weight: bold; -} - -h1 { - font-size: 26px; - margin-bottom: 12px; - line-height: 40px; - color: var(--color-text-lighter); -} - -h2 { font-size: 20px; margin-bottom: 12px; line-height: 30px; -- cgit v1.2.3