From f5932915afb0ba9231d56c68c354e8627bfdec99 Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Thu, 10 Dec 2015 15:26:57 -0500 Subject: Fixing jumping of center channel with few posts on IE11 --- web/sass-files/sass/partials/_post.scss | 1 + 1 file changed, 1 insertion(+) (limited to 'web') diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss index 3ec1c4434..fbebb4e98 100644 --- a/web/sass-files/sass/partials/_post.scss +++ b/web/sass-files/sass/partials/_post.scss @@ -209,6 +209,7 @@ body.ios { @include flex(1 1 auto); position: relative; overflow-y: hidden; + height: 100%; .post-list-holder-by-time { background: #fff; -- cgit v1.2.3-1-g7c22 From 15cc7ccafc745be683cbe9c98409187ecb6a1784 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 10 Dec 2015 14:37:15 -0800 Subject: PLT-1472 Adding back button to search click through --- web/react/components/search_results_item.jsx | 3 +-- web/react/dispatcher/event_helpers.jsx | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'web') diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx index f71abf971..f235cac0a 100644 --- a/web/react/components/search_results_item.jsx +++ b/web/react/components/search_results_item.jsx @@ -31,8 +31,7 @@ export default class SearchResultsItem extends React.Component { handleFocusRHSClick(e) { e.preventDefault(); - - EventHelpers.emitPostFocusRightHandSideEvent(this.props.post); + EventHelpers.emitPostFocusRightHandSideFromSearch(this.props.post, this.props.isMentionSearch); } render() { diff --git a/web/react/dispatcher/event_helpers.jsx b/web/react/dispatcher/event_helpers.jsx index bc1132765..862ff3594 100644 --- a/web/react/dispatcher/event_helpers.jsx +++ b/web/react/dispatcher/event_helpers.jsx @@ -4,6 +4,7 @@ import AppDispatcher from '../dispatcher/app_dispatcher.jsx'; import ChannelStore from '../stores/channel_store.jsx'; import PostStore from '../stores/post_store.jsx'; +import SearchStore from '../stores/search_store.jsx'; import Constants from '../utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; import * as AsyncClient from '../utils/async_client.jsx'; @@ -39,28 +40,27 @@ export function emitPostFocusEvent(postId) { ); } -export function emitPostFocusRightHandSideEvent(post) { +export function emitPostFocusRightHandSideFromSearch(post, isMentionSearch) { Client.getPost( post.channel_id, post.id, (data) => { AppDispatcher.handleServerAction({ type: ActionTypes.RECIEVED_POST_SELECTED, - post_list: data + post_list: data, + from_search: SearchStore.getSearchTerm() }); AppDispatcher.handleServerAction({ type: ActionTypes.RECIEVED_SEARCH, - results: null + results: null, + is_mention_search: isMentionSearch }); }, (err) => { AsyncClient.dispatchError(err, 'getPost'); } ); - - var postChannel = ChannelStore.get(post.channel_id); - Utils.switchChannel(postChannel); } export function emitLoadMorePostsEvent() { -- cgit v1.2.3-1-g7c22 From 5472bafb57a6e34f057b4b03d69f0aaa290ac019 Mon Sep 17 00:00:00 2001 From: =Corey Hulen Date: Thu, 10 Dec 2015 14:51:46 -0800 Subject: Fixing eslint error --- web/react/dispatcher/event_helpers.jsx | 1 - 1 file changed, 1 deletion(-) (limited to 'web') diff --git a/web/react/dispatcher/event_helpers.jsx b/web/react/dispatcher/event_helpers.jsx index 862ff3594..fa4d1d64f 100644 --- a/web/react/dispatcher/event_helpers.jsx +++ b/web/react/dispatcher/event_helpers.jsx @@ -9,7 +9,6 @@ import Constants from '../utils/constants.jsx'; const ActionTypes = Constants.ActionTypes; import * as AsyncClient from '../utils/async_client.jsx'; import * as Client from '../utils/client.jsx'; -import * as Utils from '../utils/utils.jsx'; export function emitChannelClickEvent(channel) { AsyncClient.getChannels(true); -- cgit v1.2.3-1-g7c22 From 9943af694811cc7724f785841d6aa4b2ca24fdb0 Mon Sep 17 00:00:00 2001 From: hmhealey Date: Fri, 11 Dec 2015 17:28:12 -0500 Subject: Changed positioning of root elements to fix weird IE11 bug --- web/sass-files/sass/partials/_base.scss | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'web') diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 61ad186e0..bb3421451 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -8,7 +8,8 @@ body { font-family: 'Open Sans', sans-serif; -webkit-font-smoothing: antialiased; background: $body-bg; - position: relative; + position: absolute; + width: 100%; height: 100%; &.white { background: #fff; @@ -35,13 +36,11 @@ body { .container-fluid { @include legacy-pie-clearfix; height: 100%; - position: relative; } .channel-view { @include clearfix; height: 100%; - position: relative; } img { -- cgit v1.2.3-1-g7c22 From 6996521751588ae802e36d7b44b19703f1de6bb1 Mon Sep 17 00:00:00 2001 From: it33 Date: Fri, 11 Dec 2015 09:31:42 -0800 Subject: Push notifications help text update --- web/react/components/admin_console/email_settings.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web') diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx index 238ace3da..42e3507d6 100644 --- a/web/react/components/admin_console/email_settings.jsx +++ b/web/react/components/admin_console/email_settings.jsx @@ -586,7 +586,7 @@ export default class EmailSettings extends React.Component { onChange={this.handleChange} disabled={!this.state.sendPushNotifications} /> -

{'Location of the push notification server.'}

+

{'Location of Mattermost push notification service you can set up behind your firewall using https://github.com/mattermost/push-proxy. For testing you can use https://push.mattermost.com, which connects to the sample Mattermost iOS app in the public Apple AppStore. Please do not use test service for production deployments.'}

-- cgit v1.2.3-1-g7c22 From 95e0fd88fc281d8b4c5fa0f924a8bb014c682dda Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 14 Dec 2015 22:27:41 +0500 Subject: 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(-) (limited to 'web') diff --git a/web/react/components/posts_view.jsx b/web/react/components/posts_view.jsx index b7ac92672..cc4f5e138 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 bb3421451..4f9e1d5c7 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 66aaede8d..2aa130fa9 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 f328f0971..0c0fd930f 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 { -- cgit v1.2.3-1-g7c22 From b5a1d0863c49b85610694ddb49996795013b523e Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 14 Dec 2015 23:00:48 +0500 Subject: Removing translateX --- web/sass-files/sass/partials/_sidebar--right.scss | 5 ----- 1 file changed, 5 deletions(-) (limited to 'web') diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index 0c0fd930f..488f704de 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 { -- cgit v1.2.3-1-g7c22 From cada044b9b7dec55dc6a28c8e03072363046d29e Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 14 Dec 2015 23:09:51 +0500 Subject: Adding sidebar animation back --- web/sass-files/sass/partials/_sidebar--right.scss | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'web') diff --git a/web/sass-files/sass/partials/_sidebar--right.scss b/web/sass-files/sass/partials/_sidebar--right.scss index 488f704de..0c0fd930f 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 { -- cgit v1.2.3-1-g7c22 From 20fceae163d0aaa1ca11287b913967c671bc55a4 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Mon, 14 Dec 2015 23:39:31 +0500 Subject: Updating container fluid css --- web/sass-files/sass/partials/_base.scss | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'web') diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 4f9e1d5c7..9271fad47 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 { -- cgit v1.2.3-1-g7c22 From 4af0cb7767d2e6a431b74f280a54b96d86ef7774 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Tue, 15 Dec 2015 00:05:48 +0500 Subject: 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(-) (limited to 'web') diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 9271fad47..4f9e1d5c7 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 0c0fd930f..e39f7730b 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; -- cgit v1.2.3-1-g7c22