diff options
author | Corey Hulen <corey@hulen.com> | 2015-12-21 09:04:42 -0800 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-12-21 09:04:42 -0800 |
commit | a960cf5244ed930d694a4ddafb561d6d7e7a0a02 (patch) | |
tree | bfe64eb190efef860c944e7a65208259967c5028 /web/react/components/sidebar_right.jsx | |
parent | 840335911f613d478047eebcc1461f62b9c59612 (diff) | |
parent | 9ab31d0a2b83e8f44282fa346b7c000c325c033c (diff) | |
download | chat-a960cf5244ed930d694a4ddafb561d6d7e7a0a02.tar.gz chat-a960cf5244ed930d694a4ddafb561d6d7e7a0a02.tar.bz2 chat-a960cf5244ed930d694a4ddafb561d6d7e7a0a02.zip |
Merge pull request #1760 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
Diffstat (limited to 'web/react/components/sidebar_right.jsx')
-rw-r--r-- | web/react/components/sidebar_right.jsx | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/web/react/components/sidebar_right.jsx b/web/react/components/sidebar_right.jsx index ac1049da0..ee247265d 100644 --- a/web/react/components/sidebar_right.jsx +++ b/web/react/components/sidebar_right.jsx @@ -52,14 +52,29 @@ 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(); + $('.inner__wrap').removeClass('.move--right'); $('.inner__wrap').addClass('move--left'); $('.sidebar--left').removeClass('move--right'); $('.sidebar--right').addClass('move--left'); //$('.sidebar--right').prepend('<div class="sidebar__overlay"></div>'); - - if (!(this.state.search_visible || this.state.post_right_visible)) { + if (this.state.search_visible || this.state.post_right_visible) { + if (windowWidth > 960) { + $('.inner__wrap').velocity({marginRight: sidebarRightWidth}, {duration: 500, easing: 'easeOutSine'}); + $('.sidebar--right').velocity({translateX: 0}, {duration: 500, easing: 'easeOutSine'}); + } else { + $('.inner__wrap, .sidebar--right').attr('style', ''); + } + } else { + if (windowWidth > 960) { + $('.inner__wrap').velocity({marginRight: 0}, {duration: 500, easing: 'easeOutSine'}); + $('.sidebar--right').velocity({translateX: sidebarRightWidth}, {duration: 500, easing: 'easeOutSine'}); + } else { + $('.inner__wrap, .sidebar--right').attr('style', ''); + } $('.inner__wrap').removeClass('move--left').removeClass('move--right'); $('.sidebar--right').removeClass('move--left'); return ( |