summaryrefslogtreecommitdiffstats
path: root/webapp/sass/layout/_post.scss
diff options
context:
space:
mode:
authorDebanshu Kundu <debanshu.kundu@joshtechnologygroup.com>2017-01-12 21:17:29 +0530
committerHarrison Healey <harrisonmhealey@gmail.com>2017-01-12 10:47:29 -0500
commit739f32272ff4079b5638d6293a28ed8ffbbb926e (patch)
tree41003e0c12c7ca1bd517bac0d29dd6cd9a3d59bb /webapp/sass/layout/_post.scss
parent99493bc5fa11d8e50d46c19e2678ddb2c99c0bbb (diff)
downloadchat-739f32272ff4079b5638d6293a28ed8ffbbb926e.tar.gz
chat-739f32272ff4079b5638d6293a28ed8ffbbb926e.tar.bz2
chat-739f32272ff4079b5638d6293a28ed8ffbbb926e.zip
PLT-135 Showing "(Edited)" indicator if a message has been edited. (#4923)
Diffstat (limited to 'webapp/sass/layout/_post.scss')
-rw-r--r--webapp/sass/layout/_post.scss39
1 files changed, 35 insertions, 4 deletions
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss
index 1e7b45fba..ff2dce422 100644
--- a/webapp/sass/layout/_post.scss
+++ b/webapp/sass/layout/_post.scss
@@ -560,9 +560,9 @@
}
blockquote {
- display: inline-block;
font-size: 1em;
margin-left: 0;
+ margin-top: 1.3em;
padding: 3px 0 0 25px;
vertical-align: top;
@@ -572,6 +572,11 @@
top: 2px;
}
}
+ .search-item-snippet {
+ blockquote {
+ margin-top: 0;
+ }
+ }
.markdown__heading {
clear: both;
@@ -598,7 +603,15 @@
}
p + p {
- margin-top: 1em;
+ margin: 1em 0;
+ &:last-of-type {
+ margin-bottom: 0;
+ }
+ }
+ span {
+ > p:first-child {
+ margin-bottom: 1em;
+ }
}
ol,
@@ -978,12 +991,24 @@
width: 100%;
word-wrap: break-word;
- p {
+ div {
margin: 0 0 .4em;
}
p + p {
- margin-top: 1.4em;
+ margin: 1.4em 0;
+ &:last-of-type {
+ margin-bottom: 0;
+ }
+ }
+
+ span {
+ > p:last-child {
+ display: inline;
+ }
+ > p:first-child {
+ margin-bottom: 1.4em;
+ }
}
li {
@@ -1063,6 +1088,12 @@
color: $white;
}
}
+
+ span.edited {
+ color: #A3A3A3;
+ font-size: 0.87em;
+ opacity: 0.6;
+ }
}
.post__link {