Browse Source

SCSS: merge %links-text and %lists-text

These were always being used together, so there's no real need to have
different placeholders.
merge-requests/70/head
Deimos 6 years ago
parent
commit
581770a763
  1. 3
      tildes/scss/_base.scss
  2. 7
      tildes/scss/_placeholders.scss
  3. 3
      tildes/scss/modules/_comment.scss
  4. 3
      tildes/scss/modules/_form.scss
  5. 3
      tildes/scss/modules/_message.scss
  6. 3
      tildes/scss/modules/_static-site.scss
  7. 6
      tildes/scss/modules/_topic.scss

3
tildes/scss/_base.scss

@ -43,8 +43,7 @@ code {
} }
dl dd { dl dd {
@extend %links-text;
@extend %lists-text;
@extend %text-container;
margin-left: 0.4rem; margin-left: 0.4rem;
font-size: 0.7rem; font-size: 0.7rem;

7
tildes/scss/_placeholders.scss

@ -1,8 +1,8 @@
// Copyright (c) 2018 Tildes contributors <code@tildes.net> // Copyright (c) 2018 Tildes contributors <code@tildes.net>
// SPDX-License-Identifier: AGPL-3.0-or-later // SPDX-License-Identifier: AGPL-3.0-or-later
// sets up links specifically for text content
%links-text {
// styles specifically for elements containing text content (often from markdown)
%text-container {
a { a {
text-decoration: underline; text-decoration: underline;
@ -10,10 +10,7 @@
text-decoration: none; text-decoration: none;
} }
} }
}
// sets up (nested) lists specifically for text content
%lists-text {
ol, ul { ol, ul {
margin: 0 0 0.4rem 1rem; margin: 0 0 0.4rem 1rem;

3
tildes/scss/modules/_comment.scss

@ -135,8 +135,7 @@
} }
.comment-text { .comment-text {
@extend %links-text;
@extend %lists-text;
@extend %text-container;
padding: 0.2rem; padding: 0.2rem;
padding-left: 0.4rem; padding-left: 0.4rem;

3
tildes/scss/modules/_form.scss

@ -45,8 +45,7 @@ select.form-select:not([multiple]) {
} }
.form-markdown-preview { .form-markdown-preview {
@extend %links-text;
@extend %lists-text;
@extend %text-container;
min-height: 8rem; min-height: 8rem;
padding: 0.4rem; padding: 0.4rem;

3
tildes/scss/modules/_message.scss

@ -24,8 +24,7 @@
} }
.message-text { .message-text {
@extend %links-text;
@extend %lists-text;
@extend %text-container;
margin-left: 0.2rem; margin-left: 0.2rem;
overflow: auto; overflow: auto;

3
tildes/scss/modules/_static-site.scss

@ -8,7 +8,6 @@
body.static-site { body.static-site {
main { main {
@extend %links-text;
@extend %lists-text;
@extend %text-container;
} }
} }

6
tildes/scss/modules/_topic.scss

@ -156,8 +156,7 @@
} }
.topic-text-excerpt { .topic-text-excerpt {
@extend %links-text;
@extend %lists-text;
@extend %text-container;
display: none; display: none;
@media (min-width: $size-md) { @media (min-width: $size-md) {
@ -248,8 +247,7 @@
} }
.topic-full-text { .topic-full-text {
@extend %links-text;
@extend %lists-text;
@extend %text-container;
overflow: auto; overflow: auto;
} }

Loading…
Cancel
Save