diff options
| author | Asaad Mahmood <asaadmahmoodspin@users.noreply.github.com> | 2016-05-10 23:47:57 +0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-05-10 14:47:57 -0400 |
| commit | 338223d204c76c713acd6ae2165e5d97c71f3c18 (patch) | |
| tree | 76deb625970729f2f975f953217f9313afc8642d /webapp | |
| parent | c8285185a91c48f9b6db866b65b293cb9eceeb65 (diff) | |
| download | chat-338223d204c76c713acd6ae2165e5d97c71f3c18.tar.gz chat-338223d204c76c713acd6ae2165e5d97c71f3c18.tar.bz2 chat-338223d204c76c713acd6ae2165e5d97c71f3c18.zip | |
Fixing DM separator and margin on system console (#2944)
Fixing margins on system console
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/admin_console/setting.jsx | 2 | ||||
| -rw-r--r-- | webapp/sass/layout/_sidebar-left.scss | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/webapp/components/admin_console/setting.jsx b/webapp/components/admin_console/setting.jsx index 8fc5c2ad8..7dee6c8dc 100644 --- a/webapp/components/admin_console/setting.jsx +++ b/webapp/components/admin_console/setting.jsx @@ -5,7 +5,7 @@ import React from 'react'; export default class Setting extends React.Component { render() { - let marginClass; + let marginClass = ''; if (this.props.margin === 'small') { marginClass = ' form-group--small'; } diff --git a/webapp/sass/layout/_sidebar-left.scss b/webapp/sass/layout/_sidebar-left.scss index ad23df6ca..7ac1fee75 100644 --- a/webapp/sass/layout/_sidebar-left.scss +++ b/webapp/sass/layout/_sidebar-left.scss @@ -16,9 +16,10 @@ color: $white; font-size: .9em; height: 20px; - margin: 5px 0 6px; line-height: 20px; + margin: 5px 0 6px; position: relative; + z-index: 0; &:before { background: $light-gray; |