diff --git a/tildes/package.json b/tildes/package.json index b38d4f3..e81c038 100644 --- a/tildes/package.json +++ b/tildes/package.json @@ -136,6 +136,7 @@ "selector-combinator-space-after": "always", "selector-combinator-space-before": "always", "selector-descendant-combinator-no-non-space": true, + "selector-list-comma-newline-after": "always", "selector-list-comma-newline-before": "never-multi-line", "selector-max-empty-lines": 0, "selector-pseudo-class-case": "lower", diff --git a/tildes/scss/_base.scss b/tildes/scss/_base.scss index 9b36fd1..cd977c8 100644 --- a/tildes/scss/_base.scss +++ b/tildes/scss/_base.scss @@ -86,7 +86,12 @@ form { max-width: 40rem; } -h1, h2, h3, h4, h5, h6 { +h1, +h2, +h3, +h4, +h5, +h6 { margin-bottom: 0.4rem; } @@ -147,11 +152,13 @@ menu { // We'll use lists for their semantic value sometimes, so we don't want them to // have the normal list numbering/etc. by default. We'll specifically add that // back in for text-based lists in places where it's needed. -ol, ul { +ol, +ul { list-style: none; margin: 0; - ol, ul { + ol, + ul { list-style: none; } } @@ -188,7 +195,8 @@ table { margin-bottom: 1rem; } -td, th { +td, +th { border-bottom: $border-width solid; padding: $unit-3 $unit-2; } diff --git a/tildes/scss/_placeholders.scss b/tildes/scss/_placeholders.scss index d5b8285..4efba61 100644 --- a/tildes/scss/_placeholders.scss +++ b/tildes/scss/_placeholders.scss @@ -16,7 +16,8 @@ max-width: $paragraph-max-width; } - ol, ul { + ol, + ul { $list-left-margin: 2rem; margin: 0 0 0.4rem $list-left-margin; @@ -25,7 +26,8 @@ max-width: $paragraph-max-width - $list-left-margin; } - ol, ul { + ol, + ul { margin-left: 1rem; } diff --git a/tildes/scss/modules/_comment.scss b/tildes/scss/modules/_comment.scss index 394f589..0b4b7fd 100644 --- a/tildes/scss/modules/_comment.scss +++ b/tildes/scss/modules/_comment.scss @@ -215,7 +215,8 @@ } } -.is-comment-deleted, .is-comment-removed { +.is-comment-deleted, +.is-comment-removed { font-size: 0.7rem; font-style: italic; } diff --git a/tildes/scss/modules/_divider.scss b/tildes/scss/modules/_divider.scss index e549f4f..0b2d7b3 100644 --- a/tildes/scss/modules/_divider.scss +++ b/tildes/scss/modules/_divider.scss @@ -1,6 +1,7 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -.divider, .divider[data-content] { +.divider, +.divider[data-content] { margin: 1rem; } diff --git a/tildes/scss/modules/_form.scss b/tildes/scss/modules/_form.scss index 0ef6cd1..7d08a87 100644 --- a/tildes/scss/modules/_form.scss +++ b/tildes/scss/modules/_form.scss @@ -14,7 +14,8 @@ select.form-select:not([multiple]) { .form-listing-options { margin-left: 1rem; - label, select { + label, + select { font-size: 0.6rem; } diff --git a/tildes/scss/modules/_group.scss b/tildes/scss/modules/_group.scss index e4cab14..cea0e25 100644 --- a/tildes/scss/modules/_group.scss +++ b/tildes/scss/modules/_group.scss @@ -28,7 +28,8 @@ align-items: center; margin: 1rem 0; - .group-subscription-count, button { + .group-subscription-count, + button { flex: 1; // makes the two elements equal width } diff --git a/tildes/scss/modules/_link.scss b/tildes/scss/modules/_link.scss index f41e5b4..ea7b8af 100644 --- a/tildes/scss/modules/_link.scss +++ b/tildes/scss/modules/_link.scss @@ -1,7 +1,8 @@ // Copyright (c) 2018 Tildes contributors // SPDX-License-Identifier: AGPL-3.0-or-later -a.link-user, a.link-group { +a.link-user, +a.link-group { white-space: nowrap; text-decoration: none; diff --git a/tildes/scss/modules/_menu.scss b/tildes/scss/modules/_menu.scss index c1aaa90..17afd47 100644 --- a/tildes/scss/modules/_menu.scss +++ b/tildes/scss/modules/_menu.scss @@ -3,7 +3,8 @@ .menu { .menu-item { - > a:hover, > a:focus { + > a:hover, + > a:focus { background-color: transparent; } } diff --git a/tildes/scss/modules/_post.scss b/tildes/scss/modules/_post.scss index f7d9183..fec7d47 100644 --- a/tildes/scss/modules/_post.scss +++ b/tildes/scss/modules/_post.scss @@ -6,7 +6,8 @@ margin-bottom: 1rem; } - .is-topic-mine, .is-topic-official { + .is-topic-mine, + .is-topic-official { margin-left: -1px; } } diff --git a/tildes/scss/modules/_site-header.scss b/tildes/scss/modules/_site-header.scss index d60149f..344e8ed 100644 --- a/tildes/scss/modules/_site-header.scss +++ b/tildes/scss/modules/_site-header.scss @@ -43,7 +43,9 @@ font-size: 1.2rem; font-weight: bold; - &:hover, &:active, &:focus { + &:hover, + &:active, + &:focus { text-decoration: none; } diff --git a/tildes/scss/modules/_text.scss b/tildes/scss/modules/_text.scss index e347c22..a2c246e 100644 --- a/tildes/scss/modules/_text.scss +++ b/tildes/scss/modules/_text.scss @@ -12,23 +12,33 @@ // special formatting rules for wiki pages .text-wiki { - h1, h2, h3, h4, h5, h6 { + h1, + h2, + h3, + h4, + h5, + h6 { a { text-decoration: none; } } - h1, h2, h3 { + h1, + h2, + h3 { border-bottom: 1px dotted; padding-bottom: 0.2rem; } - h1, h2 { + h1, + h2 { margin-top: 2rem; } // smaller margin when two large headers are sequential - h1 + h1, h1 + h2, h2 + h2 { + h1 + h1, + h1 + h2, + h2 + h2 { margin-top: 1rem; } diff --git a/tildes/scss/themes/_theme_base.scss b/tildes/scss/themes/_theme_base.scss index 3d3e5de..acf4610 100644 --- a/tildes/scss/themes/_theme_base.scss +++ b/tildes/scss/themes/_theme_base.scss @@ -445,7 +445,12 @@ } .text-wiki { - h1, h2, h3, h4, h5, h6 { + h1, + h2, + h3, + h4, + h5, + h6 { a { color: map-get($theme, "foreground-highlight"); }