Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Commit

Permalink
Multiple UI Improvements
Browse files Browse the repository at this point in the history
* Fixing backstage scrolling and link issue

* Fixing system console and color picker css

* Changing the toggleclass
  • Loading branch information
Asaad Mahmood authored and crspeller committed Apr 5, 2016
1 parent 6566d35 commit 21d6adb
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 7 deletions.
4 changes: 4 additions & 0 deletions components/backstage/backstage_navbar.jsx
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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() {
Expand Down
5 changes: 5 additions & 0 deletions sass/components/_dropdown.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
@charset 'UTF-8';

.dropdown-menu {

&.colorpicker {
z-index: 2500;
}

.divider {
@include opacity(.15);
}
Expand Down
2 changes: 1 addition & 1 deletion sass/layout/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@charset 'UTF-8';

.footer-pane {
background: $light-gray;
background: $bg--gray;
padding-bottom: 1em;

.footer-link {
Expand Down
11 changes: 6 additions & 5 deletions sass/responsive/_desktop.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -48,11 +54,6 @@
}
}

.backstage-content {
margin: 46px 46px 46px 150px;
}


.inner-wrap {
&.move--left {
.file-overlay {
Expand Down
3 changes: 2 additions & 1 deletion sass/routes/_admin-console.scss
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@
}

> h4 {
background: #333;
background: alpha-color($white, .15);
color: $white;
margin: 1px 0 0;
padding: 10px;

Expand Down
21 changes: 21 additions & 0 deletions sass/routes/_backstage.scss
Original file line number Diff line number Diff line change
@@ -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%;
Expand Down

0 comments on commit 21d6adb

Please sign in to comment.