diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-09-28 07:20:33 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-09-28 07:20:33 -0400 |
commit | 1ea3f6831e6218166fd72494af00c3d0c67096f4 (patch) | |
tree | 663ddd262d1616597442022423f14a6724ed4b1e /web | |
parent | 65b4d225f13ad4c96407004496dd93e066473ca3 (diff) | |
parent | 40194b6a4806dfc55cdff87c91f77b292521528b (diff) | |
download | chat-1ea3f6831e6218166fd72494af00c3d0c67096f4.tar.gz chat-1ea3f6831e6218166fd72494af00c3d0c67096f4.tar.bz2 chat-1ea3f6831e6218166fd72494af00c3d0c67096f4.zip |
Merge pull request #823 from asaadmahmoodspin/plt-441
PLT-441 - Minor Ui touches to the admin console
Diffstat (limited to 'web')
-rw-r--r-- | web/react/components/admin_console/admin_sidebar.jsx | 10 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_admin-console.scss | 11 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_mentions.scss | 4 |
3 files changed, 21 insertions, 4 deletions
diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx index cebb3ff20..4b9ff3cb8 100644 --- a/web/react/components/admin_console/admin_sidebar.jsx +++ b/web/react/components/admin_console/admin_sidebar.jsx @@ -138,6 +138,8 @@ export default class AdminSidebar extends React.Component { <span>{'SETTINGS'}</span> </h4> </li> + </ul> + <ul className='nav nav__sub-menu padded'> <li> <a href='#' @@ -219,6 +221,8 @@ export default class AdminSidebar extends React.Component { {'GitLab Settings'} </a> </li> + </ul> + <ul className='nav nav__sub-menu'> <li> <h4> <span className='icon fa fa-gear'></span> @@ -233,15 +237,21 @@ export default class AdminSidebar extends React.Component { </span> </h4> </li> + </ul> + <ul className='nav nav__sub-menu padded'> <li> {teams} </li> + </ul> + <ul className='nav nav__sub-menu'> <li> <h4> <span className='icon fa fa-gear'></span> <span>{'OTHER'}</span> </h4> </li> + </ul> + <ul className='nav nav__sub-menu padded'> <li> <a href='#' diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss index e0019eb9b..11794a269 100644 --- a/web/sass-files/sass/partials/_admin-console.scss +++ b/web/sass-files/sass/partials/_admin-console.scss @@ -1,5 +1,5 @@ -.sidebar--left { - &.sidebar--collapsable { + +.sidebar--left { &.sidebar--collapsable { background: #333; .team__header { background: transparent; @@ -9,7 +9,7 @@ li { padding: 0; .icon { - width: 15px; + width: 17px; } > a { color: #fff; @@ -22,7 +22,7 @@ > h4 { background: #333; padding: 10px 10px; - margin-top: 1px; + margin: 1px 0 0; } } .menu-icon--right { @@ -40,6 +40,9 @@ &.nav__sub-menu { background: #111; -webkit-font-smoothing: auto; + &.padded { + padding: 5px 0; + } li { > a { font-size: 13px; diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss index 83cdde53b..48746ba01 100644 --- a/web/sass-files/sass/partials/_mentions.scss +++ b/web/sass-files/sass/partials/_mentions.scss @@ -63,6 +63,10 @@ padding-left: 10px; } +.mention-link { + color: $primary-color; +} + .mention-highlight { background-color:#fff2bb; color: #333; |