Skip to content

GitLab

S
scratch-www
Commit 5b9cef8d authored by Technoboy10's avatar Technoboy10
Browse files
Options

navbar mobile

parent a9def9c1
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 18 deletions
src/components/navigation/www/navigation.jsx
View file @ 5b9cef8d
...@@ -248,7 +248,8 @@ var Navigation = React.createClass({ ...@@ -248,7 +248,8 @@ var Navigation = React.createClass({
<a className={dropdownClasses} <a className={dropdownClasses}
href="#" onClick={this.handleAccountNavClick}> href="#" onClick={this.handleAccountNavClick}>
<Avatar src={this.props.session.session.user.thumbnailUrl} alt="" /> <Avatar src={this.props.session.session.user.thumbnailUrl} alt="" />
{this.props.session.session.user.username} {this.props.layout == 'COLS8' || this.props.layout == 'COLS12' ?
this.props.session.session.user.username : ''}
</a> </a>
<Dropdown <Dropdown
as="ul" as="ul"
...@@ -302,7 +303,7 @@ var Navigation = React.createClass({ ...@@ -302,7 +303,7 @@ var Navigation = React.createClass({
isOpen={this.state.registrationOpen} isOpen={this.state.registrationOpen}
onRequestClose={this.closeRegistration} onRequestClose={this.closeRegistration}
onRegistrationDone={this.completeRegistration} />, onRegistrationDone={this.completeRegistration} />,
<li className="link login-item" key="login"> <li className="link right login-item" key="login">
<a <a
href="#" href="#"
onClick={this.handleLoginClick} onClick={this.handleLoginClick}
......
src/components/navigation/www/navigation.scss
View file @ 5b9cef8d
...@@ -228,34 +228,91 @@ ...@@ -228,34 +228,91 @@
} }
//4 columns //4 columns
@media only screen and (max-width: $mobile - 1) { @media only screen and (max-width: $mobile - 1) {
#navigation .inner > ul > li { #navigation .inner {
&.create, width: $cols4;
&.explore,
&.discuss, > ul > li {
&.help, &.create,
&.search { &.explore,
display: none; &.discuss,
&.help,
&.search,
&.mystuff {
display: none;
}
&.login-item {
margin-left: 0;
}
&.account-nav {
margin-left: 0;
> a {
.avatar {
margin-right: 0;
}
&:after {
display: none;
}
}
}
} }
} }
} }
//6 columns //6 columns
@media only screen and (min-width: $mobile) and (max-width: $tablet - 1) { @media only screen and (min-width: $mobile) and (max-width: $tablet - 1) {
#navigation .inner > ul > li { #navigation .inner {
&.explore, width: $cols6;
&.discuss,
&.search { > ul > li {
display: none; &.explore,
&.discuss,
&.search,
&.mystuff {
display: none;
}
&.login-item {
margin-left: 0;
}
&.account-nav {
margin-left: 0;
> a {
.avatar {
margin-right: 0;
}
&:after {
display: none;
}
}
}
} }
} }
} }
//8 columns //8 columns
@media only screen and (min-width: $tablet) and (max-width: $desktop - 1) { @media only screen and (min-width: $tablet) and (max-width: $desktop - 1) {
#navigation .inner > ul > li { #navigation .inner {
&.explore, width: $cols8;
&.search {
display: none; > ul > li {
&.explore,
&.search,
&.mystuff {
display: none;
}
&.login-item,
&.account-nav {
margin-left: 0;
}
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment