diff options
| author | Asaad Mahmood <asaadmahmoodspin@users.noreply.github.com> | 2016-05-03 16:50:18 +0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-05-03 07:50:18 -0400 |
| commit | 3a17fd86a0345b2410cf885bf4e862c6c3505745 (patch) | |
| tree | 3b04bc1485c7fd823f83ffd656410b27761705e6 | |
| parent | 2ae993125f0f79e182ac275083443a588621313a (diff) | |
| download | chat-3a17fd86a0345b2410cf885bf4e862c6c3505745.tar.gz chat-3a17fd86a0345b2410cf885bf4e862c6c3505745.tar.bz2 chat-3a17fd86a0345b2410cf885bf4e862c6c3505745.zip | |
PLT-2758 - Removing sidebar animation (#2856)
| -rw-r--r-- | webapp/components/sidebar_right.jsx | 19 | ||||
| -rw-r--r-- | webapp/sass/layout/_content.scss | 4 | ||||
| -rw-r--r-- | webapp/sass/responsive/_tablet.scss | 12 |
3 files changed, 16 insertions, 19 deletions
diff --git a/webapp/components/sidebar_right.jsx b/webapp/components/sidebar_right.jsx index 43b4a34bb..22ddfc205 100644 --- a/webapp/components/sidebar_right.jsx +++ b/webapp/components/sidebar_right.jsx @@ -2,7 +2,6 @@ // See License.txt for license information. import $ from 'jquery'; -import velocity from 'velocity-animate'; import SearchResults from './search_results.jsx'; import RhsThread from './rhs_thread.jsx'; @@ -63,29 +62,13 @@ export default class SidebarRight extends React.Component { doStrangeThings() { // We should have a better way to do this stuff // Hence the function name. - var windowWidth = $(window).outerWidth(); - var sidebarRightWidth = $('.sidebar--right').outerWidth(); - $('.app__body .inner-wrap').removeClass('.move--right'); $('.app__body .inner-wrap').addClass('move--left'); $('.app__body .sidebar--left').removeClass('move--right'); $('.app__body .sidebar--right').addClass('move--left'); //$('.sidebar--right').prepend('<div class="sidebar__overlay"></div>'); - if (this.state.searchVisible || this.state.postRightVisible) { - if (windowWidth > 960) { - velocity($('.app__body .inner-wrap'), {marginRight: sidebarRightWidth}, {duration: 500, easing: 'easeOutSine'}); - velocity($('.app__body .sidebar--right'), {translateX: 0}, {duration: 500, easing: 'easeOutSine'}); - } else { - $('.app__body .inner-wrap, .sidebar--right').attr('style', ''); - } - } else { - if (windowWidth > 960) { - velocity($('.app__body .inner-wrap'), {marginRight: 0}, {duration: 500, easing: 'easeOutSine'}); - velocity($('.app__body .sidebar--right'), {translateX: sidebarRightWidth}, {duration: 500, easing: 'easeOutSine'}); - } else { - $('.app__body .inner-wrap, .sidebar--right').attr('style', ''); - } + if (!this.state.searchVisible && !this.state.postRightVisible) { $('.app__body .inner-wrap').removeClass('move--left').removeClass('move--right'); $('.app__body .sidebar--right').removeClass('move--left'); return ( diff --git a/webapp/sass/layout/_content.scss b/webapp/sass/layout/_content.scss index bbc09a80e..514093f1f 100644 --- a/webapp/sass/layout/_content.scss +++ b/webapp/sass/layout/_content.scss @@ -39,7 +39,6 @@ @include flex(0 0 auto); cursor: pointer; font-size: 13px; - padding: 10px 20px; .fa { @include opacity(.7); @@ -48,6 +47,9 @@ a { color: inherit; + display: block; + padding: 10px 20px; + width: 100%; } } diff --git a/webapp/sass/responsive/_tablet.scss b/webapp/sass/responsive/_tablet.scss index 659100263..1e9dedb8a 100644 --- a/webapp/sass/responsive/_tablet.scss +++ b/webapp/sass/responsive/_tablet.scss @@ -70,6 +70,18 @@ display: none; } + .sidebar--right { + &.move--left { + @include translateX(0); + } + } + + .inner-wrap { + &.move--left { + margin-right: 400px; + } + } + .post { &.same--root { &.same--user { |