Skip to content
This repository has been archived by the owner on Oct 11, 2022. It is now read-only.

Commit

Permalink
Merge pull request #4203 from withspectrum/2.4.62
Browse files Browse the repository at this point in the history
2.4.62
  • Loading branch information
brianlovin authored Nov 6, 2018
2 parents 8d11a55 + 9e5bda1 commit e3558cb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Spectrum",
"version": "2.4.61",
"version": "2.4.62",
"license": "BSD-3-Clause",
"devDependencies": {
"@babel/preset-flow": "^7.0.0",
Expand Down
6 changes: 0 additions & 6 deletions src/views/pages/components/nav.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,27 +130,21 @@ class Nav extends React.Component<Props, State> {
to="/features"
selected={this.props.location === 'features'}
>
<Icon glyph="checkmark" />
Features
<Icon glyph="enter" />
</FeaturesLink>
<AppsLink to="/apps" selected={this.props.location === 'apps'}>
<Icon glyph="plus" />
Apps
<Icon glyph="enter" />
</AppsLink>
<SupportLink
to="/support"
selected={this.props.location === 'support'}
>
<Icon glyph="like" />
Support
</SupportLink>
<ExploreLink
to="/explore"
selected={this.props.location === 'explore'}
>
<Icon glyph="explore" />
Explore
</ExploreLink>
{this.props.currentUser ? (
Expand Down
7 changes: 4 additions & 3 deletions src/views/pages/style.js
Original file line number Diff line number Diff line change
Expand Up @@ -571,19 +571,19 @@ export const LogoTab = styled(Tab)`

export const DropdownLink = styled(Link)`
padding: 16px 0;
font-weight: 500;
font-weight: ${props => (props.selected ? '600' : '500')};
display: flex;
width: 100%;
align-items: center;
transition: ${Transition.hover.off};
color: ${props =>
props.selected ? props.theme.text.placeholder : props.theme.brand.alt};
props.selected ? props.theme.brand.alt : props.theme.text.alt};
border-radius: 8px;
&:hover {
transition: ${Transition.hover.on};
color: ${props =>
props.selected ? props.theme.text.alt : props.theme.brand.default};
props.selected ? props.theme.brand.default : props.theme.text.secondary};
}
`;

Expand Down Expand Up @@ -649,6 +649,7 @@ export const MenuContainer = styled.div`
box-shadow: ${Shadow.high} ${props => hexa(props.theme.bg.reverse, 0.25)};
padding-top: 32px;
z-index: 2;
flex-direction: column;
`;

export const MenuOverlay = styled.div`
Expand Down

0 comments on commit e3558cb

Please sign in to comment.