mirror of
https://github.com/empayre/fleet.git
synced 2024-11-06 08:55:24 +00:00
Updated User Menu Design (#749)
This commit is contained in:
parent
ab540cdfb5
commit
87edc9c238
@ -2,7 +2,6 @@ import React, { Component, PropTypes } from 'react';
|
||||
import classnames from 'classnames';
|
||||
|
||||
import configInterface from 'interfaces/config';
|
||||
import Icon from 'components/icons/Icon';
|
||||
import OrgLogoIcon from 'components/icons/OrgLogoIcon';
|
||||
import userInterface from 'interfaces/user';
|
||||
import UserMenu from 'components/side_panels/SiteNavHeader/UserMenu';
|
||||
@ -74,8 +73,7 @@ class SiteNavHeader extends Component {
|
||||
const headerToggleClass = classnames(
|
||||
`${headerBaseClass}__button`,
|
||||
'button',
|
||||
'button--unstyled',
|
||||
{ [`${headerBaseClass}__button--open`]: userMenuOpened }
|
||||
'button--unstyled'
|
||||
);
|
||||
|
||||
const userStatusClass = classnames(
|
||||
@ -91,7 +89,6 @@ class SiteNavHeader extends Component {
|
||||
<h1 className={`${headerBaseClass}__org-name`}>{orgName}</h1>
|
||||
<div className={userStatusClass} />
|
||||
<h2 className={`${headerBaseClass}__username`}>{username}</h2>
|
||||
<Icon name="chevrondown" className={`${headerBaseClass}__org-chevron`} />
|
||||
</div>
|
||||
|
||||
<UserMenu
|
||||
|
@ -12,74 +12,9 @@
|
||||
text-align: left;
|
||||
border-radius: 0;
|
||||
|
||||
&:hover {
|
||||
background: $bg-medium;
|
||||
}
|
||||
|
||||
@include breakpoint(smalldesk) {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
&--open {
|
||||
background-color: $text-dark;
|
||||
z-index: 6;
|
||||
|
||||
.site-nav-header__org {
|
||||
border-color: $text-ultradark;
|
||||
}
|
||||
|
||||
.site-nav-header__org-name,
|
||||
.site-nav-header__username {
|
||||
color: $white;
|
||||
}
|
||||
|
||||
.site-nav-header__org-chevron {
|
||||
@include transform(rotate(180deg));
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background-color: $text-dark;
|
||||
}
|
||||
|
||||
@include breakpoint(smalldesk) {
|
||||
width: 240px;
|
||||
|
||||
.site-nav-header__org,
|
||||
.user-menu-toggle {
|
||||
box-shadow: 1px 6px 15px 0 rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
.user-menu-toggle {
|
||||
span {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
.site-nav-header__org-chevron {
|
||||
float: right;
|
||||
margin-right: 27px;
|
||||
}
|
||||
|
||||
.site-nav-header__org-name {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.site-nav-header__user-status,
|
||||
.user-menu-toggle__name,
|
||||
.user-menu-toggle__position,
|
||||
.site-nav-header__username {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.site-nav-header__user-status {
|
||||
margin-left: 11px;
|
||||
}
|
||||
|
||||
.site-nav-header__logo {
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&__org {
|
||||
@ -151,38 +86,22 @@
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
&__org-chevron {
|
||||
@include transition(transform 150ms $ease-in-quad);
|
||||
color: $accent-medium;
|
||||
font-size: 12px;
|
||||
float: right;
|
||||
|
||||
@include breakpoint(smalldesk) {
|
||||
float: none;
|
||||
text-align: center;
|
||||
display: block;
|
||||
clear: both;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.user-menu-toggle {
|
||||
@include transition(opacity 150ms ease-in-out);
|
||||
height: 0;
|
||||
background-color: $text-dark;
|
||||
width: 239px;
|
||||
position: absolute;
|
||||
left: 0;
|
||||
left: $base;
|
||||
padding: 0;
|
||||
z-index: 2;
|
||||
overflow: hidden;
|
||||
opacity: 0;
|
||||
box-sizing: border-box;
|
||||
|
||||
@include breakpoint(smalldesk) {
|
||||
width: 240px;
|
||||
}
|
||||
border-radius: 4px;
|
||||
background-color: #443a6b;
|
||||
box-shadow: 1px 6px 15px 0 rgba(0, 0, 0, 0.2);
|
||||
border: solid 1px rgba(73, 143, 226, 0.6);
|
||||
|
||||
&--open {
|
||||
height: auto;
|
||||
@ -196,38 +115,28 @@
|
||||
border: solid 1px $accent-medium;
|
||||
border-radius: 50%;
|
||||
margin: 0 10px 0 $pad-medium;
|
||||
|
||||
@include breakpoint(smalldesk) {
|
||||
margin: $pad-xsmall 5px;
|
||||
}
|
||||
}
|
||||
|
||||
&__name,
|
||||
&__position {
|
||||
@include ellipsis(170px);
|
||||
color: $white;
|
||||
font-size: $small;
|
||||
margin: 0;
|
||||
line-height: $large;
|
||||
float: left;
|
||||
text-transform: none;
|
||||
font-weight: $normal;
|
||||
|
||||
@include breakpoint(smalldesk) {
|
||||
display: none;
|
||||
margin-left: 15px;
|
||||
}
|
||||
font-size: 15px;
|
||||
font-weight: $bold;
|
||||
line-height: 1.6;
|
||||
letter-spacing: -0.5px;
|
||||
color: rgba(255, 255, 255, 0.95);
|
||||
}
|
||||
|
||||
&__name {
|
||||
@include breakpoint(smalldesk) {
|
||||
margin-top: 4px;
|
||||
}
|
||||
&__position {
|
||||
font-weight: $normal;
|
||||
color: rgba(255, 255, 255, 0.6);
|
||||
}
|
||||
|
||||
&__nav {
|
||||
clear: both;
|
||||
padding-top: $pad-small;
|
||||
}
|
||||
|
||||
&__nav-list {
|
||||
@ -237,31 +146,45 @@
|
||||
}
|
||||
|
||||
&__nav-item {
|
||||
font-size: $small;
|
||||
text-transform: uppercase;
|
||||
font-size: 15px;
|
||||
font-weight: $normal;
|
||||
letter-spacing: 0.5px;
|
||||
padding: 14px 0;
|
||||
|
||||
a {
|
||||
@include transition(background 150ms $ease-in-quad);
|
||||
letter-spacing: 0.5px;
|
||||
@include transition(opacity 75ms $ease-in-quad, background 75ms $ease-in-quad);
|
||||
color: $white;
|
||||
display: block;
|
||||
line-height: 50px;
|
||||
text-decoration: none;
|
||||
padding: 0 $pad-medium;
|
||||
text-transform: none;
|
||||
margin: 0 18px;
|
||||
line-height: 40px;
|
||||
border-radius: 4px;
|
||||
padding: 0 9px;
|
||||
opacity: 0.75;
|
||||
|
||||
&:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
i {
|
||||
margin-right: $pad-half;
|
||||
font-size: $large;
|
||||
}
|
||||
|
||||
&:hover {
|
||||
background: $accent-text;
|
||||
vertical-align: text-bottom;
|
||||
}
|
||||
}
|
||||
|
||||
@include breakpoint(smalldesk) {
|
||||
span {
|
||||
display: none;
|
||||
&:first-child {
|
||||
border-bottom: solid 1px rgba(73, 143, 226, 0.4);
|
||||
|
||||
a:hover {
|
||||
background-color: $link;
|
||||
}
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
a:hover {
|
||||
background-color: #3c3655;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user