diff options
| author | John Molakvoæ <skjnldsv@users.noreply.github.com> | 2018-10-29 13:15:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-29 13:15:55 +0100 |
| commit | c58b935bf5994fe4b4110290c20ce447f2ea1eff (patch) | |
| tree | ae7c10539042dfab6caa9707c393cb8b29c3e736 | |
| parent | 0ee7ffcde15554d40dbac88de8dd49ee16afec77 (diff) | |
| parent | 371cf29f0c17aea6b86a0ffa3754a95427014571 (diff) | |
| download | nextcloud-server-c58b935bf5994fe4b4110290c20ce447f2ea1eff.tar.gz nextcloud-server-c58b935bf5994fe4b4110290c20ce447f2ea1eff.zip | |
Merge pull request #11993 from nextcloud/headings-standards
Headings standard
| -rw-r--r-- | core/css/apps.scss | 19 | ||||
| -rw-r--r-- | core/css/styles.scss | 1 | ||||
| -rw-r--r-- | settings/css/settings.scss | 8 |
3 files changed, 11 insertions, 17 deletions
diff --git a/core/css/apps.scss b/core/css/apps.scss index dc05d2b3fbb..8b94d08ce2e 100644 --- a/core/css/apps.scss +++ b/core/css/apps.scss @@ -17,22 +17,23 @@ */ /* BASE STYLING ------------------------------------------------------------ */ - -h2, -h3, -h4 { - font-weight: bold; -} - +// no h1 allowed since h1 = logo h2 { + font-weight: bold; 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 */ diff --git a/core/css/styles.scss b/core/css/styles.scss index 5f68a0d08e0..4b80b4f9626 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 8500d6a8353..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 { @@ -224,7 +219,6 @@ select { flex-wrap: nowrap; justify-content: flex-start; width: 100%; - font-weight: 300; > label { white-space: nowrap; @@ -319,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 { |