tree@4596393

This commit is contained in:
Galen Wolfe-Pauly 2016-04-18 15:29:22 -07:00 committed by Raymond Pasco
parent c5968a92a7
commit 9b5372af38
2 changed files with 29 additions and 16 deletions

View File

@ -98,20 +98,40 @@ div.logo.inverse:before {
content: "\25D0"; } content: "\25D0"; }
@media (min-width: 544px) { @media (min-width: 544px) {
#head { .ctrl {
width: 576px; } } width: 114px; }
.ctrl.open,
.ctrl:hover {
max-width: 258px;
min-width: 114px;
width: auto; } }
@media (min-width: 768px) { @media (min-width: 768px) {
#head { .ctrl {
width: 720px; } } width: 150px; }
.ctrl.open,
.ctrl:hover {
max-width: 330px;
min-width: 150px;
width: auto; } }
@media (min-width: 992px) { @media (min-width: 992px) {
#head { .ctrl {
width: 940px; } } width: 205px; }
.ctrl.open,
.ctrl:hover {
max-width: 440px;
min-width: 205px;
width: auto; } }
@media (min-width: 1200px) { @media (min-width: 1200px) {
#head { .ctrl {
width: 1140px; } } width: 255px; }
.ctrl.open,
.ctrl:hover {
max-width: 540px;
min-width: 255px;
width: auto; } }
#head .loading { #head .loading {
display: none; } display: none; }
@ -188,12 +208,6 @@ div.logo.inverse:before {
border: 0; border: 0;
text-transform: none; } text-transform: none; }
.ctrl.open,
.ctrl:hover {
max-width: 33.33333%;
min-width: 16.66667%;
width: auto; }
.ctrl.navbar.open, .ctrl.navbar.open,
.ctrl.navbar:hover { .ctrl.navbar:hover {
max-width: none; max-width: none;

View File

@ -1279,7 +1279,6 @@ Nav = React.createFactory(query({
}); });
navClas = { navClas = {
navbar: this.props.meta.navmode === 'navbar', navbar: this.props.meta.navmode === 'navbar',
'col-md-2': this.props.meta.navmode !== 'navbar',
ctrl: true, ctrl: true,
open: this.state.open === true open: this.state.open === true
}; };
@ -1346,7 +1345,7 @@ Nav = React.createFactory(query({
}, },
render: function() { render: function() {
return div({ return div({
className: "col-md-2 ctrl", className: "ctrl",
"data-path": this.props.dataPath, "data-path": this.props.dataPath,
key: "nav-loading" key: "nav-loading"
}, div({ }, div({