diff options
| author | Thomas Hopkins <thomchop@users.noreply.github.com> | 2016-11-04 12:56:54 -0700 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2016-11-04 15:56:54 -0400 |
| commit | 7117fc05620eef128dc351e3637dc4f61d463ef9 (patch) | |
| tree | e6f8f64bebf3bdce4e904105db66c1571aaca667 /webapp | |
| parent | 9ba3c5487535404748025b4deaaed935b44f6f03 (diff) | |
| download | chat-7117fc05620eef128dc351e3637dc4f61d463ef9.tar.gz chat-7117fc05620eef128dc351e3637dc4f61d463ef9.tar.bz2 chat-7117fc05620eef128dc351e3637dc4f61d463ef9.zip | |
PLT-4486 Don't apply sidebar bg color to settings modals w/o tabs (#4460)
* PLT-4486 Don't apply sidebar bg color to settings modals w/o tabs
* PLT-4486 Use more correct naming for tabless modals
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/channel_notifications_modal.jsx | 2 | ||||
| -rw-r--r-- | webapp/utils/utils.jsx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/channel_notifications_modal.jsx b/webapp/components/channel_notifications_modal.jsx index ff6e69f70..ff8ef94f7 100644 --- a/webapp/components/channel_notifications_modal.jsx +++ b/webapp/components/channel_notifications_modal.jsx @@ -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} > diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 81f304fa3..5d456bf83 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -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) { |