From f51cc73aaf0da4973e13821a5201cd0e05e1e552 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 6 Jul 2015 23:18:23 +0500 Subject: MM-1461 - Updating Mattermost UI --- web/sass-files/sass/partials/_responsive.scss | 76 +++++++++++++++++---------- 1 file changed, 48 insertions(+), 28 deletions(-) (limited to 'web/sass-files/sass/partials/_responsive.scss') diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 0037879cf..e2c89a6f2 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -2,13 +2,6 @@ .inner__wrap { &.move--left { .post { - &.post--comment { - &.other--root { - .post-comment { - margin-left: -7px; - } - } - } &.same--root { margin-left: 60px; padding-left: 10px; @@ -24,13 +17,24 @@ .post-body { width: 736px; border: none; - margin: 0; + margin: 3px 0 0; + } + } + &.post--comment { + &.other--root { + .post-comment { + margin-left: 0; + } + } + &.same--root { + margin-top: 10px; + margin-bottom: 10px; } } .post-body { float: none; width: 750px; - margin: 0; + margin: 3px 0 0; } .post__content { width: 920px; @@ -79,18 +83,10 @@ } } .post { - &.post--comment { - &.other--root { - .post-comment { - margin-left: -7px; - } - } - } &.same--root { margin-left: 60px; padding-left: 10px; border-left: 4px solid #EEE; - margin-bottom: 10px; div.post-profile-img__container { .post-profile-img { display: none; @@ -102,7 +98,18 @@ .post-body { width: 736px; border: none; - margin: 0; + margin: 3px 0 0; + } + } + &.post--comment { + &.other--root { + .post-comment { + margin-left: 0; + } + } + &.same--root { + margin-top: 5px; + margin-bottom: 5px; } } .post__content { @@ -137,7 +144,7 @@ } } .post-body { - margin: 0; + margin: 3px 0 0; float: none; width: 750px; } @@ -166,16 +173,9 @@ @media screen and (max-width: 960px) { .post { - &:hover { - .post-header .post-header-col.post-header__reply { - .comment-icon__container__hide { - @include opacity(0); - } - } - } .post-header .post-header-col.post-header__reply { .comment-icon__container__hide { - @include opacity(0); + display: none; } .dropdown { @include opacity(1); @@ -208,7 +208,7 @@ @media screen and (max-width: 768px) { #post-list { - .date-seperator { + .date-seperator, .new-separator { &.hovered--after { background: none; } @@ -224,6 +224,26 @@ &:hover { background: none; } + &.current--user { + &:hover { + .post-body { + background: #f5f5f5; + } + } + } + &.post--comment { + &.other--root { + &:hover { + background: none; + .post-body { + background: none; + .post-comment { + background: #f5f5f5; + } + } + } + } + } } .signup-team__container { padding: 30px 0; -- cgit v1.2.3-1-g7c22