diff options
Diffstat (limited to 'web/react')
-rw-r--r-- | web/react/components/admin_console/team_analytics.jsx | 2 | ||||
-rw-r--r-- | web/react/components/sidebar_right.jsx | 11 | ||||
-rw-r--r-- | web/react/utils/constants.jsx | 1 |
3 files changed, 10 insertions, 4 deletions
diff --git a/web/react/components/admin_console/team_analytics.jsx b/web/react/components/admin_console/team_analytics.jsx index 6c8e63c83..e28699d3c 100644 --- a/web/react/components/admin_console/team_analytics.jsx +++ b/web/react/components/admin_console/team_analytics.jsx @@ -221,7 +221,7 @@ export default class TeamAnalytics extends React.Component { var openChannelCount = ( <div className='col-sm-3'> <div className='total-count'> - <div className='title'>{'Public Groups'}<i className='fa fa-unlock-alt'/></div> + <div className='title'>{'Public Channels'}<i className='fa fa-globe'/></div> <div className='content'>{this.state.channel_open_count == null ? 'Loading...' : this.state.channel_open_count}</div> </div> </div> diff --git a/web/react/components/sidebar_right.jsx b/web/react/components/sidebar_right.jsx index 22d702369..ac1049da0 100644 --- a/web/react/components/sidebar_right.jsx +++ b/web/react/components/sidebar_right.jsx @@ -7,6 +7,8 @@ import SearchStore from '../stores/search_store.jsx'; import PostStore from '../stores/post_store.jsx'; import * as Utils from '../utils/utils.jsx'; +const SIDEBAR_SCROLL_DELAY = 500; + export default class SidebarRight extends React.Component { constructor(props) { super(props); @@ -39,8 +41,13 @@ export default class SidebarRight extends React.Component { PostStore.removeSelectedPostChangeListener(this.onSelectedChange); SearchStore.removeShowSearchListener(this.onShowSearch); } - componentWillUpdate() { - PostStore.jumpPostsViewSidebarOpen(); + componentWillUpdate(nextProps, nextState) { + const isOpen = this.state.search_visible || this.state.post_right_visible; + const willOpen = nextState.search_visible || nextState.post_right_visible; + + if (!isOpen && willOpen) { + setTimeout(() => PostStore.jumpPostsViewSidebarOpen(), SIDEBAR_SCROLL_DELAY); + } } doStrangeThings() { // We should have a better way to do this stuff diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index c4fa38e91..891bc4624 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -361,7 +361,6 @@ export default { 'Droid Serif': 'font--droid_serif', 'Roboto Slab': 'font--roboto_slab', Lora: 'font--lora', - Slabo: 'font--slabo', Arvo: 'font--arvo', 'Open Sans': 'font--open_sans', Roboto: 'font--roboto', |