diff options
author | Mark Otto <markdotto@gmail.com> | 2014-07-07 11:39:06 +0400 |
---|---|---|
committer | Mark Otto <markdotto@gmail.com> | 2014-07-07 11:39:06 +0400 |
commit | 6f88238a6beb21dbcb817447e591030f839d11f8 (patch) | |
tree | 8a0aa920280b4cbc4a0c2a0b2ab5c28b89082bb4 /less/navbar.less | |
parent | 907b3b2892ef6df12275c7e26a6ff1403560eb18 (diff) | |
parent | e88fa909916ab8aa6e35a99b11f025470a4a067f (diff) |
Merge pull request #14051 from loic/issue13325
Address margins on .navbar-right to fix #13325 #13464.
Diffstat (limited to 'less/navbar.less')
-rw-r--r-- | less/navbar.less | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/less/navbar.less b/less/navbar.less index 58cbae14d8..c7bdd36cc4 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -275,26 +275,10 @@ padding-bottom: @navbar-padding-vertical; } } - - &.navbar-right:first-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 { .pull-left(); } - .navbar-right { .pull-right(); } -} - - // Navbar form // // Extension of the `.form-inline` with some extra flavor for optimum display in @@ -330,11 +314,6 @@ padding-top: 0; padding-bottom: 0; .box-shadow(none); - - // Outdent the form if first child to line up with content down the page - &.navbar-right:first-child { - margin-right: -@navbar-padding-horizontal; - } } } @@ -379,14 +358,31 @@ float: left; margin-left: @navbar-padding-horizontal; margin-right: @navbar-padding-horizontal; + } +} - // Outdent the form if first child to line up with content down the page - &.navbar-right:first-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 { .pull-left(); } + .navbar-right { + .pull-right(); + margin-right: -@navbar-padding-horizontal; + + ~ .navbar-right { margin-right: 0; } } } + // Alternate navbars // -------------------------------------------------- |