summaryrefslogtreecommitdiffstats
path: root/web/sass-files/sass/partials
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-06-25 11:41:33 -0400
committerCorey Hulen <corey@hulen.com>2015-06-25 11:41:33 -0400
commitd9dfb2cbd1051af178f58f509dcfe8b106abb1a5 (patch)
treed175ed4845e4c674162ef29d761048cff705226a /web/sass-files/sass/partials
parent0537e87a9087b6d16c5d24e850584b0a0803526d (diff)
parente454cf54fa500594ff77a7869754b38345393435 (diff)
downloadchat-d9dfb2cbd1051af178f58f509dcfe8b106abb1a5.tar.gz
chat-d9dfb2cbd1051af178f58f509dcfe8b106abb1a5.tar.bz2
chat-d9dfb2cbd1051af178f58f509dcfe8b106abb1a5.zip
Merge pull request #41 from asaadmahmoodspin/master
MM-1253 - Fixing new message and date separator corner case
Diffstat (limited to 'web/sass-files/sass/partials')
-rw-r--r--web/sass-files/sass/partials/_post.scss68
1 files changed, 41 insertions, 27 deletions
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index 6da516cf9..745d50173 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -42,49 +42,63 @@ body.ios {
}
#post-list {
- .new-seperator {
+ .date-separator, .new-separator {
text-align: center;
- padding: 1em 0;
- .new-seperator__hr {
- border-color: #FFAF53;
- margin: 0;
+ height: 2em;
+ margin: 0;
+ position: relative;
+ &:before, &:after {
+ content: "";
+ height: 1em;
+ position: absolute;
+ left: 0;
+ width: 100%;
+ display: none;
}
- .new-seperator__text {
- margin-top: -11px;
- color: #FF8800;
- background: #FFF;
- display: inline-block;
- padding: 0 1em;
- font-weight: normal;
+ &:before {
+ bottom: 0;
+ }
+ &:after {
+ top: 0;
}
- }
- .date-seperator {
- text-align: center;
- margin: 1em 0;
- height: 0;
&.hovered--after {
- margin-bottom: 0;
- padding-bottom: 1em;
- background: #f6f6f6;
+ &:before {
+ background: #f6f6f6;
+ display: block;
+ }
}
&.hovered--before {
- margin-top: 0;
- padding-top: 1em;
- background: #f6f6f6;
+ &:after {
+ background: #f6f6f6;
+ display: block;
+ }
}
- .date-seperator__hr {
+ .separator__hr {
border-color: #ccc;
margin: 0;
+ position: relative;
+ z-index: 5;
+ top: 1em;
}
- .date-seperator__text {
- margin-top: -13px;
- line-height: 24px;
+ .separator__text {
+ line-height: 2em;
color: #555;
background: #FFF;
display: inline-block;
padding: 0 1em;
font-weight: 900;
@include border-radius(50px);
+ position: relative;
+ z-index: 5;
+ }
+ }
+ .new-separator {
+ .separator__hr {
+ border-color: #FFAF53;
+ }
+ .separator__text {
+ color: #F80;
+ font-weight: normal;
}
}
.post-list-holder-by-time {