From 581770a763f1b8acd8d96a87aac69b6bf8fdf4d3 Mon Sep 17 00:00:00 2001
From: Deimos <deimos@tildes.net>
Date: Thu, 16 May 2019 17:57:20 -0600
Subject: [PATCH] SCSS: merge %links-text and %lists-text

These were always being used together, so there's no real need to have
different placeholders.
---
 tildes/scss/_base.scss                | 3 +--
 tildes/scss/_placeholders.scss        | 7 ++-----
 tildes/scss/modules/_comment.scss     | 3 +--
 tildes/scss/modules/_form.scss        | 3 +--
 tildes/scss/modules/_message.scss     | 3 +--
 tildes/scss/modules/_static-site.scss | 3 +--
 tildes/scss/modules/_topic.scss       | 6 ++----
 7 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/tildes/scss/_base.scss b/tildes/scss/_base.scss
index abf5f26..6976a75 100644
--- a/tildes/scss/_base.scss
+++ b/tildes/scss/_base.scss
@@ -43,8 +43,7 @@ code {
 }
 
 dl dd {
-  @extend %links-text;
-  @extend %lists-text;
+  @extend %text-container;
 
   margin-left: 0.4rem;
   font-size: 0.7rem;
diff --git a/tildes/scss/_placeholders.scss b/tildes/scss/_placeholders.scss
index 651d99c..a1a3665 100644
--- a/tildes/scss/_placeholders.scss
+++ b/tildes/scss/_placeholders.scss
@@ -1,8 +1,8 @@
 // Copyright (c) 2018 Tildes contributors <code@tildes.net>
 // 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 {
     text-decoration: underline;
 
@@ -10,10 +10,7 @@
       text-decoration: none;
     }
   }
-}
 
-// sets up (nested) lists specifically for text content
-%lists-text {
   ol, ul {
     margin: 0 0 0.4rem 1rem;
 
diff --git a/tildes/scss/modules/_comment.scss b/tildes/scss/modules/_comment.scss
index 3b5899e..c7e49e5 100644
--- a/tildes/scss/modules/_comment.scss
+++ b/tildes/scss/modules/_comment.scss
@@ -135,8 +135,7 @@
 }
 
 .comment-text {
-  @extend %links-text;
-  @extend %lists-text;
+  @extend %text-container;
 
   padding: 0.2rem;
   padding-left: 0.4rem;
diff --git a/tildes/scss/modules/_form.scss b/tildes/scss/modules/_form.scss
index c4d44a3..0549fbe 100644
--- a/tildes/scss/modules/_form.scss
+++ b/tildes/scss/modules/_form.scss
@@ -45,8 +45,7 @@ select.form-select:not([multiple]) {
 }
 
 .form-markdown-preview {
-  @extend %links-text;
-  @extend %lists-text;
+  @extend %text-container;
 
   min-height: 8rem;
   padding: 0.4rem;
diff --git a/tildes/scss/modules/_message.scss b/tildes/scss/modules/_message.scss
index 4a99ac7..756d3fe 100644
--- a/tildes/scss/modules/_message.scss
+++ b/tildes/scss/modules/_message.scss
@@ -24,8 +24,7 @@
 }
 
 .message-text {
-  @extend %links-text;
-  @extend %lists-text;
+  @extend %text-container;
 
   margin-left: 0.2rem;
   overflow: auto;
diff --git a/tildes/scss/modules/_static-site.scss b/tildes/scss/modules/_static-site.scss
index 7bd5b7f..56ad919 100644
--- a/tildes/scss/modules/_static-site.scss
+++ b/tildes/scss/modules/_static-site.scss
@@ -8,7 +8,6 @@
 
 body.static-site {
   main {
-    @extend %links-text;
-    @extend %lists-text;
+    @extend %text-container;
   }
 }
diff --git a/tildes/scss/modules/_topic.scss b/tildes/scss/modules/_topic.scss
index 6f65c69..6b4db2e 100644
--- a/tildes/scss/modules/_topic.scss
+++ b/tildes/scss/modules/_topic.scss
@@ -156,8 +156,7 @@
 }
 
 .topic-text-excerpt {
-  @extend %links-text;
-  @extend %lists-text;
+  @extend %text-container;
 
   display: none;
   @media (min-width: $size-md) {
@@ -248,8 +247,7 @@
 }
 
 .topic-full-text {
-  @extend %links-text;
-  @extend %lists-text;
+  @extend %text-container;
 
   overflow: auto;
 }