From f600b1dc2b39ff7b2b3d8450cba43ebb643adddd Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 16 Mar 2016 20:31:21 +0500 Subject: Updating asss lint stuff with other scss improvements --- webapp/sass/responsive/_desktop.scss | 8 +++++--- webapp/sass/responsive/_mobile.scss | 9 +++------ webapp/sass/responsive/_tablet.scss | 6 +++--- 3 files changed, 11 insertions(+), 12 deletions(-) (limited to 'webapp/sass/responsive') diff --git a/webapp/sass/responsive/_desktop.scss b/webapp/sass/responsive/_desktop.scss index dcabb807f..ccd6f0226 100644 --- a/webapp/sass/responsive/_desktop.scss +++ b/webapp/sass/responsive/_desktop.scss @@ -32,21 +32,23 @@ .tip-overlay { &.tip-overlay--chat { margin: -10px 0 0 -10px; + .arrow { - right: 15px; left: auto; + right: 15px; } } } + .inner-wrap { &.move--left { .file-overlay { font-size: em(18px); .overlay__circle { - width: 300px; height: 300px; margin: -150px 0 0 -150px; + width: 300px; } .overlay__files { @@ -62,4 +64,4 @@ .modal-lg { width: 700px; } -} \ No newline at end of file +} diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index 4a1397143..53ea6d329 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -519,7 +519,7 @@ .search-bar__container { padding: 0; @include flex(0 0 44px); - background: $color--primary; + background: $primary-color; color: #fff; &.focused { @@ -756,9 +756,11 @@ .app__content { padding-top: 45px; margin: 0; + .channel__wrap & { padding-top: 45px; } + #channel-header { display: none; } @@ -775,11 +777,6 @@ .post-comments { padding: 9px 21px 10px 10px !important; } - - .post-image__column .post-image .file-playback__controls.stop, - .image-wrapper > a .file-playback__controls.stop { - @include opacity(1); - } } @media screen and (max-width: 640px) { diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss index 14641cfa5..0a725a558 100644 --- a/webapp/sass/responsive/_tablet.scss +++ b/webapp/sass/responsive/_tablet.scss @@ -2,9 +2,9 @@ @media screen and (max-width: 960px) { .sidebar--right { - z-index: 5; - @include translateX(100%); @include single-transition(all, .5s, ease); + @include translateX(100%); + z-index: 5; &.move--left { @include translateX(0); @@ -32,4 +32,4 @@ .second-bar { display: none; } -} \ No newline at end of file +} -- cgit v1.2.3-1-g7c22