From 95e0fd88fc281d8b4c5fa0f924a8bb014c682dda Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 14 Dec 2015 22:27:41 +0500 Subject: [PATCH 1/5] Fixing IE scrolling issue and also fixing horizontal scrollbar --- web/react/components/posts_view.jsx | 3 ++- web/sass-files/sass/partials/_base.scss | 4 +++- web/sass-files/sass/partials/_responsive.scss | 2 -- web/sass-files/sass/partials/_sidebar--right.scss | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/web/react/components/posts_view.jsx b/web/react/components/posts_view.jsx index b7ac926720..cc4f5e1384 100644 --- a/web/react/components/posts_view.jsx +++ b/web/react/components/posts_view.jsx @@ -233,7 +233,8 @@ export default class PostsView extends React.Component { window.requestAnimationFrame(() => { // If separator exists scroll to it. Otherwise scroll to bottom. if (this.refs.newMessageSeparator) { - this.refs.newMessageSeparator.scrollIntoView(); + var objDiv = this.refs.postlist; + objDiv.scrollTop = this.refs.newMessageSeparator.offsetTop; //scrolls node to top of Div } else { this.refs.postlist.scrollTop = this.refs.postlist.scrollHeight; } diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index bb34214516..4f9e1d5c72 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -8,7 +8,7 @@ body { font-family: 'Open Sans', sans-serif; -webkit-font-smoothing: antialiased; background: $body-bg; - position: absolute; + position: relative; width: 100%; height: 100%; &.white { @@ -36,11 +36,13 @@ body { .container-fluid { @include legacy-pie-clearfix; height: 100%; + position: relative; } .channel-view { @include clearfix; height: 100%; + position: relative; } img { diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 66aaede8d2..2aa130fa9e 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -54,9 +54,7 @@ @media screen and (max-width: 960px) { .sidebar--right { - width: 400px; z-index: 5; - right: 0; @include translateX(100%); &.move--left { diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index f328f09718..0c0fd930f5 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -8,10 +8,10 @@ padding: 0; background: #fff; @include single-transition(transform, 0.5s, ease); - right: -320px; + @include translateX(400px); &.move--left { - right: 0; + @include translateX(0); } .post-body { From b5a1d0863c49b85610694ddb49996795013b523e Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 14 Dec 2015 23:00:48 +0500 Subject: [PATCH 2/5] Removing translateX --- web/sass-files/sass/partials/_sidebar--right.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index 0c0fd930f5..488f704dea 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -8,11 +8,6 @@ padding: 0; background: #fff; @include single-transition(transform, 0.5s, ease); - @include translateX(400px); - - &.move--left { - @include translateX(0); - } .post-body { From cada044b9b7dec55dc6a28c8e03072363046d29e Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 14 Dec 2015 23:09:51 +0500 Subject: [PATCH 3/5] Adding sidebar animation back --- web/sass-files/sass/partials/_sidebar--right.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index 488f704dea..0c0fd930f5 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -8,6 +8,11 @@ padding: 0; background: #fff; @include single-transition(transform, 0.5s, ease); + @include translateX(400px); + + &.move--left { + @include translateX(0); + } .post-body { From 20fceae163d0aaa1ca11287b913967c671bc55a4 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 14 Dec 2015 23:39:31 +0500 Subject: [PATCH 4/5] Updating container fluid css --- web/sass-files/sass/partials/_base.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 4f9e1d5c72..9271fad471 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -43,6 +43,12 @@ body { @include clearfix; height: 100%; position: relative; + .container-fluid { + position: absolute; + left: 0; + top: 0; + width: 100%; + } } img { From 4af0cb7767d2e6a431b74f280a54b96d86ef7774 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 15 Dec 2015 00:05:48 +0500 Subject: [PATCH 5/5] Fixing pageup issue --- web/sass-files/sass/partials/_base.scss | 6 ------ web/sass-files/sass/partials/_sidebar--right.scss | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 9271fad471..4f9e1d5c72 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -43,12 +43,6 @@ body { @include clearfix; height: 100%; position: relative; - .container-fluid { - position: absolute; - left: 0; - top: 0; - width: 100%; - } } img { diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index 0c0fd930f5..e39f7730ba 100644 --- a/web/sass-files/sass/partials/_sidebar--right.scss +++ b/web/sass-files/sass/partials/_sidebar--right.scss @@ -1,7 +1,7 @@ @charset "UTF-8"; .sidebar--right { - position: absolute; + position: fixed; width: 400px; height: 100%; right: 0px;