This commit is contained in:
Oleh Zasadnyy 2015-02-21 00:35:58 +02:00
parent 261527905b
commit 554378b49b
65 changed files with 824 additions and 715 deletions

View file

@ -15,7 +15,7 @@
border: 1px solid transparent;
// Prevent floats from breaking the navbar
@include clearfix();
@include clearfix;
@media (min-width: $grid-float-breakpoint) {
border-radius: $navbar-border-radius;
@ -29,7 +29,7 @@
// styling of responsive aspects.
.navbar-header {
@include clearfix();
@include clearfix;
@media (min-width: $grid-float-breakpoint) {
float: left;
@ -53,7 +53,7 @@
padding-left: $navbar-padding-horizontal;
border-top: 1px solid transparent;
box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
@include clearfix();
@include clearfix;
-webkit-overflow-scrolling: touch;
&.in {
@ -67,6 +67,7 @@
&.collapse {
display: block !important;
visibility: visible !important;
height: auto !important;
padding-bottom: 0; // Override default setting
overflow: visible !important;
@ -92,7 +93,7 @@
.navbar-collapse {
max-height: $navbar-collapse-max-height;
@media (max-width: $screen-xs-min) and (orientation: landscape) {
@media (max-device-width: $screen-xs-min) and (orientation: landscape) {
max-height: 200px;
}
}
@ -141,7 +142,6 @@
right: 0;
left: 0;
z-index: $zindex-navbar-fixed;
@include translate3d(0, 0, 0);
// Undo the rounded corners
@media (min-width: $grid-float-breakpoint) {
@ -173,6 +173,10 @@
text-decoration: none;
}
> img {
display: block;
}
@media (min-width: $grid-float-breakpoint) {
.navbar > .container &,
.navbar > .container-fluid & {
@ -271,26 +275,6 @@
padding-bottom: $navbar-padding-vertical;
}
}
&.navbar-right:last-child {
margin-right: -$navbar-padding-horizontal;
}
}
}
// Component alignment
//
// Repurpose the pull utilities as their own navbar utilities to avoid specificity
// issues with parents and chaining. Only do this when the navbar is uncollapsed
// though so that navbar contents properly stack and align in mobile.
@media (min-width: $grid-float-breakpoint) {
.navbar-left {
float: left !important;
}
.navbar-right {
float: right !important;
}
}
@ -310,11 +294,15 @@
@include box-shadow($shadow);
// Mixin behavior for optimum display
@extend .form-inline;
@include form-inline;
.form-group {
@media (max-width: $grid-float-breakpoint-max) {
margin-bottom: 5px;
&:last-child {
margin-bottom: 0;
}
}
}
@ -330,11 +318,6 @@
padding-top: 0;
padding-bottom: 0;
@include box-shadow(none);
// Outdent the form if last child to line up with content down the page
&.navbar-right:last-child {
margin-right: -$navbar-padding-horizontal;
}
}
}
@ -348,6 +331,8 @@
}
// Menu position and menu caret support for dropups via extra dropup class
.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
margin-bottom: 0;
@include border-top-radius($navbar-border-radius);
@include border-bottom-radius(0);
}
@ -379,14 +364,33 @@
float: left;
margin-left: $navbar-padding-horizontal;
margin-right: $navbar-padding-horizontal;
}
}
// Outdent the form if last child to line up with content down the page
&.navbar-right:last-child {
// Component alignment
//
// Repurpose the pull utilities as their own navbar utilities to avoid specificity
// issues with parents and chaining. Only do this when the navbar is uncollapsed
// though so that navbar contents properly stack and align in mobile.
//
// Declared after the navbar components to ensure more specificity on the margins.
@media (min-width: $grid-float-breakpoint) {
.navbar-left {
float: left !important;
}
.navbar-right {
float: right !important;
margin-right: -$navbar-padding-horizontal;
~ .navbar-right {
margin-right: 0;
}
}
}
// Alternate navbars
// --------------------------------------------------