diff options
Diffstat (limited to 'web/react')
| -rw-r--r-- | web/react/components/rhs_root_post.jsx | 1 | ||||
| -rw-r--r-- | web/react/components/settings_sidebar.jsx | 7 | ||||
| -rw-r--r-- | web/react/components/suggestion/search_channel_provider.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/suggestion/search_user_provider.jsx | 2 | ||||
| -rw-r--r-- | web/react/components/user_settings/custom_theme_chooser.jsx | 2 | ||||
| -rw-r--r-- | web/react/utils/utils.jsx | 5 |
6 files changed, 13 insertions, 6 deletions
diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx index dd9a793be..cd7f6766c 100644 --- a/web/react/components/rhs_root_post.jsx +++ b/web/react/components/rhs_root_post.jsx @@ -227,7 +227,6 @@ export default class RhsRootPost extends React.Component { </div> </div> </div> - <hr /> </div> ); } diff --git a/web/react/components/settings_sidebar.jsx b/web/react/components/settings_sidebar.jsx index 4af46c35a..271ea9a41 100644 --- a/web/react/components/settings_sidebar.jsx +++ b/web/react/components/settings_sidebar.jsx @@ -1,6 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. +import * as Utils from '../utils/utils.jsx'; + export default class SettingsSidebar extends React.Component { componentDidUpdate() { $('.settings-modal').find('.modal-body').scrollTop(0); @@ -16,6 +18,11 @@ export default class SettingsSidebar extends React.Component { this.props.updateTab(tab.name); $(e.target).closest('.settings-modal').addClass('display--content'); } + componentDidMount() { + if (Utils.isBrowserFirefox()) { + $('.settings-modal .settings-table .nav').addClass('position--top'); + } + } render() { let tabList = this.props.tabs.map(function makeTab(tab) { let key = `${tab.name}_li`; diff --git a/web/react/components/suggestion/search_channel_provider.jsx b/web/react/components/suggestion/search_channel_provider.jsx index 7547a9341..66a534907 100644 --- a/web/react/components/suggestion/search_channel_provider.jsx +++ b/web/react/components/suggestion/search_channel_provider.jsx @@ -19,7 +19,7 @@ class SearchChannelSuggestion extends React.Component { onClick={onClick} className={className} > - {item.name} + <i className='fa fa fa-plus-square'></i>{item.name} </div> ); } diff --git a/web/react/components/suggestion/search_user_provider.jsx b/web/react/components/suggestion/search_user_provider.jsx index cf2953937..0d553bfc4 100644 --- a/web/react/components/suggestion/search_user_provider.jsx +++ b/web/react/components/suggestion/search_user_provider.jsx @@ -22,7 +22,7 @@ class SearchUserSuggestion extends React.Component { className='profile-img rounded' src={'/api/v1/users/' + item.id + '/image?time=' + item.update_at} /> - {item.username} + <i className='fa fa fa-plus-square'></i>{item.username} </div> ); } diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx index b7d90922a..8ec3863f3 100644 --- a/web/react/components/user_settings/custom_theme_chooser.jsx +++ b/web/react/components/user_settings/custom_theme_chooser.jsx @@ -104,7 +104,7 @@ export default class CustomThemeChooser extends React.Component { > <label className='custom-label'>{element.uiName}</label> <div - className='input-group theme-group dropdown' + className='input-group theme-group group--code dropdown' id={element.id} > <select diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 2ade00d29..c2b2ce15a 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -647,10 +647,11 @@ export function applyTheme(theme) { changeCss('.attachment .attachment__content', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.3), 1); changeCss('.channel-intro .channel-intro__content, .webhooks__container', 'background:' + changeOpacity(theme.centerChannelColor, 0.05), 1); changeCss('.date-separator .separator__text', 'color:' + theme.centerChannelColor, 2); - changeCss('.date-separator .separator__hr, .modal-footer, .modal .custom-textarea, .post-right__container .post.post--root hr, .search-item-container', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1); + changeCss('.date-separator .separator__hr, .modal-footer, .modal .custom-textarea', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1); + changeCss('.search-item-container, .post-right__container .post.post--root', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.1), 1); changeCss('.modal .custom-textarea:focus', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.3), 1); changeCss('.channel-intro, .settings-modal .settings-table .settings-content .divider-dark, hr, .settings-modal .settings-table .settings-links', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1); - changeCss('.post.current--user .post__body, .post.post--comment.other--root.current--user .post-comment, pre', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1); + changeCss('.post.current--user .post__body, .post.post--comment.other--root.current--user .post-comment, pre, .post-right__container .post.post--root', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1); changeCss('.post.current--user .post__body, .post.post--comment.other--root.current--user .post-comment, .post.same--root.post--comment .post__body, .modal .more-table tbody>tr td, .member-div:first-child, .member-div, .access-history__table .access__report, .activity-log__table', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.1), 2); changeCss('@media(max-width: 1800px){.inner__wrap.move--left .post.post--comment.same--root', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.07), 2); changeCss('.post:hover, .modal .more-table tbody>tr:hover td, .settings-modal .settings-table .settings-content .section-min:hover', 'background:' + changeOpacity(theme.centerChannelColor, 0.07), 1); |