IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

PLT-4486 Don't apply sidebar bg color to settings modals w/o tabs (#4460)

Browse Source 
* PLT-4486 Don't apply sidebar bg color to settings modals w/o tabs

* PLT-4486 Use more correct naming for tabless modals
This commit is contained in:
Thomas Hopkins
2016-11-04 12:56:54 -07:00
committed by Harrison Healey
parent 9ba3c54875
commit 7117fc0562
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/components/channel_notifications_modal.jsx
View File

@@ -382,7 +382,7 @@ export default class ChannelNotificationsModal extends React.Component {
return (
<Modal
show={this.state.show}
dialogClassName='settings-modal'
dialogClassName='settings-modal settings-modal--tabless'
onHide={this.onHide}
onExited={this.props.onHide}
>

2
webapp/utils/utils.jsx
View File

@@ -465,7 +465,7 @@ export function applyTheme(theme) {
if (theme.sidebarBg) {
changeCss('.sidebar--left, .sidebar--left .sidebar__divider .sidebar__divider__text, .app__body .modal .settings-modal .settings-table .settings-links, .app__body .sidebar--menu', 'background:' + theme.sidebarBg, 1);
changeCss('body.app__body', 'scrollbar-face-color:' + theme.sidebarBg, 3);
changeCss('@media(max-width: 768px){.app__body .modal .settings-modal:not(.display--content) .modal-content', 'background:' + theme.sidebarBg, 1);
changeCss('@media(max-width: 768px){.app__body .modal .settings-modal:not(.settings-modal--tabless):not(.display--content) .modal-content', 'background:' + theme.sidebarBg, 1);
}
if (theme.sidebarText) {