diff options
author | nickago <ngonella@calpoly.edu> | 2015-07-09 13:44:28 -0700 |
---|---|---|
committer | nickago <ngonella@calpoly.edu> | 2015-07-09 13:44:28 -0700 |
commit | 04b80b6a25cddce0a44da1409ddc430bc8e797f5 (patch) | |
tree | 90d57d50ec325e6b4f26608d4c3c20e1e21ce11e /web/sass-files/sass/partials/_post.scss | |
parent | 38532013fa7e9b152d3750d73c149ff727881342 (diff) | |
parent | 763618ef3613d0af6baea0e1d49abb6641979841 (diff) | |
download | chat-04b80b6a25cddce0a44da1409ddc430bc8e797f5.tar.gz chat-04b80b6a25cddce0a44da1409ddc430bc8e797f5.tar.bz2 chat-04b80b6a25cddce0a44da1409ddc430bc8e797f5.zip |
Merge branch 'master' of https://github.com/mattermost/platform into MM-831
merge
Diffstat (limited to 'web/sass-files/sass/partials/_post.scss')
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 116 |
1 files changed, 59 insertions, 57 deletions
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index f33cedd16..2d5cd67db 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -41,67 +41,68 @@ body.ios { min-height:37px; } -#post-list { - .date-separator, .new-separator { - text-align: center; - height: 2em; - margin: 0; - position: relative; - &:before, &:after { - content: ""; - height: 1em; - position: absolute; - left: 0; - width: 100%; - display: none; - } +.date-separator, .new-separator { + text-align: center; + height: 2em; + margin: 0; + position: relative; + &:before, &:after { + content: ""; + height: 1em; + position: absolute; + left: 0; + width: 100%; + display: none; + } + &:before { + bottom: 0; + } + &:after { + top: 0; + } + &.hovered--after { &:before { - bottom: 0; + background: #f5f5f5; + display: block; } + } + &.hovered--before { &:after { - top: 0; - } - &.hovered--after { - &:before { - background: #f5f5f5; - display: block; - } - } - &.hovered--before { - &:after { - background: #f5f5f5; - display: block; - } - } - .separator__hr { - border-color: #ccc; - margin: 0; - position: relative; - z-index: 5; - top: 1em; - } - .separator__text { - line-height: 2em; - color: #555; - background: #FFF; - display: inline-block; - padding: 0 1em; - font-weight: 700; - @include border-radius(50px); - position: relative; - z-index: 5; - font-size: 13px; + background: #f5f5f5; + display: block; } } - .new-separator { - .separator__hr { - border-color: #FFAF53; - } - .separator__text { - color: #F80; - font-weight: normal; - } + .separator__hr { + border-color: #ccc; + margin: 0; + position: relative; + z-index: 5; + top: 1em; } + .separator__text { + line-height: 2em; + color: #555; + background: #FFF; + display: inline-block; + padding: 0 1em; + font-weight: 700; + @include border-radius(50px); + position: relative; + z-index: 5; + font-size: 13px; + } +} +.new-separator { + .separator__hr { + border-color: #FFAF53; + } + .separator__text { + color: #F80; + font-weight: normal; + } +} + +#post-list { .post-list-holder-by-time { background: #fff; overflow-y: scroll; @@ -135,6 +136,7 @@ body.ios { color: grey; } } + .post-create__container { form { width: 100%; @@ -306,7 +308,7 @@ body.ios { } .post-image__columns { @include legacy-pie-clearfix; - margin-top: 1em; + padding-bottom: 5px; } .post-info--hidden { display: none; @@ -347,7 +349,7 @@ body.ios { } &.post-info { .post-profile-time { - width: 100px; + width: 150px; display: inline-block; margin-left: 50px; } |