diff options
author | Corey Hulen <corey@hulen.com> | 2015-07-06 13:58:38 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-07-06 13:58:38 -0800 |
commit | b418f4cd62eef5388f92bd52e0cb4b006bf4ea54 (patch) | |
tree | 40b883241e8a7862fb46e3ff92be4f4d1430c6d4 /web/sass-files/sass/partials/_post.scss | |
parent | 8f48d639593b2862dc6c252c94b5fc2dadf8da03 (diff) | |
parent | f51cc73aaf0da4973e13821a5201cd0e05e1e552 (diff) | |
download | chat-b418f4cd62eef5388f92bd52e0cb4b006bf4ea54.tar.gz chat-b418f4cd62eef5388f92bd52e0cb4b006bf4ea54.tar.bz2 chat-b418f4cd62eef5388f92bd52e0cb4b006bf4ea54.zip |
Merge pull request #135 from asaadmahmoodspin/master
MM-1461 - Updating Mattermost UI
Diffstat (limited to 'web/sass-files/sass/partials/_post.scss')
-rw-r--r-- | web/sass-files/sass/partials/_post.scss | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 769cb1091..e35979b64 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -166,7 +166,7 @@ body.ios { color: #999; @include single-transition(all, 0.15s); font-size: 16px; - padding: 9px; + padding: 7px 9px 6px; &:hover, &:active { color: #444; box-shadow: none; @@ -192,7 +192,7 @@ body.ios { .post { word-wrap: break-word; - padding: 0.4em 1em; + padding: 8px 1em; position: relative; max-width: 100%; @include legacy-pie-clearfix; @@ -204,19 +204,37 @@ body.ios { } background: #f6f6f6; } + &.current--user { + .post-body { + @include border-radius(4px); + background: #f5f5f5; + } + &:hover { + .post-body { + background: #fff; + } + } + } &.post--comment { &.other--root { .post-comment { border-left: 4px solid #EEE; - margin-left: 30px; - padding: 2px 0 2px 10px; + padding: 4px 0 6px 10px; + background: #F5F5F5; + margin: 0 0 0 30px; + @include border-radius(0 4px 4px 0); + } + .post-body { + background: transparent; + margin: 0; + padding: 1px 0px; + } + &:hover { + background: #f5f5f5; + .post-comment { + background: #fff; + } } - } - } - &.current--user { - .post-body { - @include border-radius(0 4px 4px 0); - background: #f5f5f5; } } &.same--root { @@ -224,6 +242,7 @@ body.ios { @include opacity(0); } div.post-profile-img__container { + height: 1px; .post-profile-img { visibility: hidden; } @@ -260,6 +279,7 @@ body.ios { white-space: pre-wrap; } .comment-icon__container { + margin-left: 7px; fill: $primary-color; .comment-icon { display: inline-block; @@ -346,7 +366,6 @@ body.ios { } .dropdown { min-width: 18px; - margin-right: 7px; display: inline-block; @include opacity(0); } |