diff options
| -rw-r--r-- | webapp/components/backstage/backstage_navbar.jsx | 4 | ||||
| -rw-r--r-- | webapp/sass/components/_dropdown.scss | 5 | ||||
| -rw-r--r-- | webapp/sass/layout/_footer.scss | 2 | ||||
| -rw-r--r-- | webapp/sass/responsive/_desktop.scss | 11 | ||||
| -rw-r--r-- | webapp/sass/routes/_admin-console.scss | 3 | ||||
| -rw-r--r-- | webapp/sass/routes/_backstage.scss | 21 |
6 files changed, 39 insertions, 7 deletions
diff --git a/webapp/components/backstage/backstage_navbar.jsx b/webapp/components/backstage/backstage_navbar.jsx index d1dac6043..d2d2da1ed 100644 --- a/webapp/components/backstage/backstage_navbar.jsx +++ b/webapp/components/backstage/backstage_navbar.jsx @@ -1,6 +1,8 @@ // Copyright (c) 2016 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. +import $ from 'jquery'; + import React from 'react'; import TeamStore from 'stores/team_store.jsx'; @@ -21,10 +23,12 @@ export default class BackstageNavbar extends React.Component { componentDidMount() { TeamStore.addChangeListener(this.handleChange); + $('body').addClass('backstage'); } componentWillUnmount() { TeamStore.removeChangeListener(this.handleChange); + $('body').removeClass('backstage'); } handleChange() { diff --git a/webapp/sass/components/_dropdown.scss b/webapp/sass/components/_dropdown.scss index f48e12c87..1168c9b27 100644 --- a/webapp/sass/components/_dropdown.scss +++ b/webapp/sass/components/_dropdown.scss @@ -1,6 +1,11 @@ @charset 'UTF-8'; .dropdown-menu { + + &.colorpicker { + z-index: 2500; + } + .divider { @include opacity(.15); } diff --git a/webapp/sass/layout/_footer.scss b/webapp/sass/layout/_footer.scss index 36f1fbc70..36fdbd55b 100644 --- a/webapp/sass/layout/_footer.scss +++ b/webapp/sass/layout/_footer.scss @@ -1,7 +1,7 @@ @charset 'UTF-8'; .footer-pane { - background: $light-gray; + background: $bg--gray; padding-bottom: 1em; .footer-link { diff --git a/webapp/sass/responsive/_desktop.scss b/webapp/sass/responsive/_desktop.scss index 3b36fb75f..38037d105 100644 --- a/webapp/sass/responsive/_desktop.scss +++ b/webapp/sass/responsive/_desktop.scss @@ -36,6 +36,12 @@ } } +@media screen and (max-width: 1258px) { + .backstage-content { + margin: 46px 46px 46px 150px; + } +} + @media screen and (max-width: 1140px) { .tip-overlay { &.tip-overlay--chat { @@ -48,11 +54,6 @@ } } - .backstage-content { - margin: 46px 46px 46px 150px; - } - - .inner-wrap { &.move--left { .file-overlay { diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss index 7e53713c0..1878ba19c 100644 --- a/webapp/sass/routes/_admin-console.scss +++ b/webapp/sass/routes/_admin-console.scss @@ -87,7 +87,8 @@ } > h4 { - background: #333; + background: alpha-color($white, .15); + color: $white; margin: 1px 0 0; padding: 10px; diff --git a/webapp/sass/routes/_backstage.scss b/webapp/sass/routes/_backstage.scss index 13c51c8b4..9685f3aef 100644 --- a/webapp/sass/routes/_backstage.scss +++ b/webapp/sass/routes/_backstage.scss @@ -1,3 +1,24 @@ +body { + &.backstage { + height: auto; + overflow: auto; + + .sidebar--right { + display: none; + } + + .navbar { + display: none; + } + + .inner-wrap { + &:before { + display: none; + } + } + } +} + .backstage-content { background-color: $bg--gray; height: 100%; |