summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2018-10-29 13:15:55 +0100
committerGitHub <noreply@github.com>2018-10-29 13:15:55 +0100
commitc58b935bf5994fe4b4110290c20ce447f2ea1eff (patch)
treeae7c10539042dfab6caa9707c393cb8b29c3e736 /core
parent0ee7ffcde15554d40dbac88de8dd49ee16afec77 (diff)
parent371cf29f0c17aea6b86a0ffa3754a95427014571 (diff)
downloadnextcloud-server-c58b935bf5994fe4b4110290c20ce447f2ea1eff.tar.gz
nextcloud-server-c58b935bf5994fe4b4110290c20ce447f2ea1eff.zip
Merge pull request #11993 from nextcloud/headings-standards
Headings standard
Diffstat (limited to 'core')
-rw-r--r--core/css/apps.scss19
-rw-r--r--core/css/styles.scss1
2 files changed, 10 insertions, 10 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-'] {