about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorFire Demon <firedemon@creature.cafe>2020-08-18 12:42:33 -0500
committerFire Demon <firedemon@creature.cafe>2020-08-30 05:45:19 -0500
commitba82df2fb4460c525ab91c79f54b20803c82cce9 (patch)
tree5a4afc8424e83ea6d805063ac9a57335648e2292 /app
parenta40dee9799658b24f0478f991c629eca84b0237d (diff)
[UI] Remove unnecessary padding around content notes and text indicators
Diffstat (limited to 'app')
-rw-r--r--app/javascript/flavours/glitch/styles/monsterfork/components/formatting.scss15
-rw-r--r--app/javascript/flavours/glitch/styles/monsterfork/components/status.scss20
2 files changed, 16 insertions, 19 deletions
diff --git a/app/javascript/flavours/glitch/styles/monsterfork/components/formatting.scss b/app/javascript/flavours/glitch/styles/monsterfork/components/formatting.scss
index a9e8fbe65..44df7efc9 100644
--- a/app/javascript/flavours/glitch/styles/monsterfork/components/formatting.scss
+++ b/app/javascript/flavours/glitch/styles/monsterfork/components/formatting.scss
@@ -172,19 +172,4 @@
     text-align: right;
     margin-top: 0px;
   }
-}
-
-.status__content {
-  p, pre, blockquote {
-    margin-top: 1em;
-    margin-bottom: 0px;
-  }
-
-  p:first-child, pre:first-child, blockquote:first-child {
-    margin-top: 0px;
-  }
-
-  .status__content__spoiler.status__content__spoiler--visible {
-    margin-top: 1em;
-  }
 }
\ No newline at end of file
diff --git a/app/javascript/flavours/glitch/styles/monsterfork/components/status.scss b/app/javascript/flavours/glitch/styles/monsterfork/components/status.scss
index 37e9f0307..f1e166d69 100644
--- a/app/javascript/flavours/glitch/styles/monsterfork/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/monsterfork/components/status.scss
@@ -1,7 +1,3 @@
-.status__notice-wrapper {
-  margin-bottom: 1em;
-}
-
 .status__notice-wrapper:empty,
 .status__footers:empty {
   display: none;
@@ -140,6 +136,22 @@ div[data-nest-deep="true"] {
       margin: 1em auto;
     }
   }
+
+  p, pre, blockquote {
+    margin-top: 1em;
+    margin-bottom: 0px;
+  }
+
+  p:first-child,
+  pre:first-child,
+  blockquote:first-child,
+  div.status__notice-wrapper + p {
+    margin-top: 0px;
+  }
+
+  .status__content__spoiler.status__content__spoiler--visible {
+    margin-top: 1em;
+  }
 }
 
 div.media-caption {