summaryrefslogtreecommitdiffstats
path: root/webapp/sass
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2017-03-03 07:49:54 -0500
committerJoram Wilander <jwawilander@gmail.com>2017-03-03 07:49:54 -0500
commitca4181b5fef0395d7fe6270b9ba94f58cf9afad6 (patch)
tree977029e9174f2db2ec6295b762a2fda34ba2d09f /webapp/sass
parent7016c6b3a1356856289d57ad905bd29591da6a26 (diff)
downloadchat-ca4181b5fef0395d7fe6270b9ba94f58cf9afad6.tar.gz
chat-ca4181b5fef0395d7fe6270b9ba94f58cf9afad6.tar.bz2
chat-ca4181b5fef0395d7fe6270b9ba94f58cf9afad6.zip
PLT-5484 Reduced scope of CSS rules for (edited) tag (#5599)
* PLT-5484 Reduced scope of CSS rules for (edited) tag * Reverted accidental change from div tags to spans
Diffstat (limited to 'webapp/sass')
-rw-r--r--webapp/sass/layout/_post.scss36
1 files changed, 10 insertions, 26 deletions
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index ab391fa1d..de45eedd5 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -648,17 +648,8 @@
}
p + p {
- margin: 1em 0;
-
- &:last-of-type {
- margin-bottom: 0;
- }
- }
-
- span {
- > p:first-child {
- margin-bottom: 1em;
- }
+ margin-bottom: 1em;
+ margin-top: 1em;
}
ol,
@@ -742,10 +733,14 @@
}
.post--edited {
- p {
- &:last-child {
- display: inline-block;
- }
+ // If the last paragraph of an edited post is a paragraph, make it inline-block so that the (edited) indicator can be on the same line as it
+ .post-message__text > p:last-child {
+ display: inline-block;
+ }
+
+ .post-edited-indicator {
+ @include opacity(.6);
+ font-size: .87em;
}
}
@@ -1041,10 +1036,6 @@
p + p {
margin: 1.2em 0 0;
-
- &:last-of-type {
- margin-bottom: 0;
- }
}
img {
@@ -1129,13 +1120,6 @@
}
}
- span {
- &.edited {
- @include opacity(.6);
- font-size: .87em;
- }
- }
-
.post-reaction-list {
min-height: 30px;
}