archive/theorangeone.net-legacy
Archived
1
Fork 0
Code Releases Packages Activity

Fix navbar

Browse source
This commit is contained in:
Jake Howard 2016-02-28 22:27:01 +00:00
parent 42193b8246
commit 0505cf46dd
2 changed files with 30 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
static/src/less/navbar.less
View file

@ -8,23 +8,13 @@
.transition(~"ease-in-out .3s color"); .transition(~"ease-in-out .3s color");
} }
& > li { & > li {
height: @navbar-height;
@media (min-width: @screen-md-min) { @media (min-width: @screen-md-min) {
margin-right: 23px; margin-right: 23px;
} }
&:not(.dropdown) > a {
padding-top: 12px;
}
& > a {
@media (min-width: @screen-md-min) {
padding: 10px 10px;
}
@media (max-width: @screen-xs-max) {
padding: 15px 15px;
}
}
} }
.dropdown-toggle, & > li > a { .dropdown-toggle, & > li > a {
font-size: 18px; font-size: 19px;
} }
.dropdown-menu { .dropdown-menu {
@media (min-width: @screen-sm) { @media (min-width: @screen-sm) {
@ -44,9 +34,6 @@
.open & { .open & {
opacity: 1; opacity: 1;
} }
a {
padding-left: 20px;
}
} }
} }
@ -54,6 +41,7 @@
.navbar { .navbar {
max-height: @navbar-height; max-height: @navbar-height;
border-radius: 0; border-radius: 0;
border: none;
.home-button a { .home-button a {
.transition(~"ease-in-out .3 all"); .transition(~"ease-in-out .3 all");
} }
@ -68,7 +56,8 @@
} }
#navbar-container { #navbar-container {
z-index: 0; margin: 0;
z-index: 10000;
@media (max-width: @screen-xs-max) { @media (max-width: @screen-xs-max) {
width: 96%; width: 96%;
left: 2%; left: 2%;
@ -76,8 +65,6 @@
@media (min-width: @screen-sm-min) { @media (min-width: @screen-sm-min) {
width: 100%; width: 100%;
} }
margin: 0;
z-index: 10000;
i + *, .glyphicon + * { i + *, .glyphicon + * {
margin-left: 5px; margin-left: 5px;
} }
@ -87,7 +74,7 @@
} }
&.align { &.align {
@media (min-width: @screen-sm) { @media (min-width: @screen-sm) {
position: absolute; position: initial;
height: @navbar-height; height: @navbar-height;
} }
@media (max-width: @screen-sm) { @media (max-width: @screen-sm) {
@ -125,20 +112,32 @@
z-index: 10000; z-index: 10000;
} }
@media (min-width: @screen-xs-max) {
navbar + * {
margin-top: @navbar-height;
}
}
/* @group Header Navbar*/ /* @group Header Navbar*/
@media (min-width: @screen-xs-max) { @media (min-width: @screen-sm-min) {
.header navbar{ .header {
#navbar-container { #navbar-container {
margin: 0 auto; margin: 0 auto;
width: 100%; width: 110%;
margin-left: -5%;
&:not(.stick-top) {
position: initial;
}
&.stick-top {
@container-size: 720px;
width: @container-size * 1.1;
margin-left: -@container-size * 0.05;
@media (min-width: @screen-md-min) {
@container-size: 940px;
width: @container-size * 1.1;
margin-left: -@container-size * 0.05;
}
@media (min-width: @screen-lg-min) {
@container-size: 1140px;
width: @container-size * 1.1;
margin-left: -@container-size * 0.05;
}
}
} }
}; }
} }
/* @end Header Navbar*/ /* @end Header Navbar*/

2
static/src/less/variables.less
View file

@ -142,7 +142,7 @@
@container-md: @container-desktop; @container-md: @container-desktop;
@container-large-desktop: (1140px + @grid-gutter-width); @container-large-desktop: (1140px + @grid-gutter-width);
@container-lg: @container-large-desktop; @container-lg: @container-large-desktop;
@navbar-height: 52px; @navbar-height: 50px;
@navbar-margin-bottom: @line-height-computed; @navbar-margin-bottom: @line-height-computed;
@navbar-border-radius: @border-radius-base; @navbar-border-radius: @border-radius-base;
@navbar-padding-horizontal: floor((@grid-gutter-width / 2)); @navbar-padding-horizontal: floor((@grid-gutter-width / 2));