mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-21 04:41:36 +02:00
Code Issues Releases Wiki Activity

Fixes #11610: Add @grid-float-breakpoint-max to better link navbar behavior across viewports and improve customization.

Browse Source 
Also addresses #10371, #10395, and #10465.
This commit is contained in:
Mark Otto
2013-12-04 22:32:56 -08:00
parent cf81cb60ef
commit 45930acdf7
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs-assets/js/raw-files.js
View File

File diff suppressed because one or more lines are too long

8
less/navbar.less
View File

@@ -213,7 +213,7 @@
line-height: @line-height-computed; line-height: @line-height-computed;
} }
@media (max-width: @screen-xs-max) { @media (max-width: @grid-float-breakpoint-max) {
// Dropdowns get custom display when collapsed // Dropdowns get custom display when collapsed
.open .dropdown-menu { .open .dropdown-menu {
position: static; position: static;
@@ -287,7 +287,7 @@
.form-inline(); .form-inline();
.form-group { .form-group {
@media (max-width: @screen-xs-max) { @media (max-width: @grid-float-breakpoint-max) {
margin-bottom: 5px; margin-bottom: 5px;
} }
} }
@@ -445,7 +445,7 @@
} }
} }
@media (max-width: @screen-xs-max) { @media (max-width: @grid-float-breakpoint-max) {
// Dropdowns get custom display when collapsed // Dropdowns get custom display when collapsed
.open .dropdown-menu { .open .dropdown-menu {
> li > a { > li > a {
@@ -565,7 +565,7 @@
} }
} }
@media (max-width: @screen-xs-max) { @media (max-width: @grid-float-breakpoint-max) {
// Dropdowns get custom display // Dropdowns get custom display
.open .dropdown-menu { .open .dropdown-menu {
> .dropdown-header { > .dropdown-header {

7
less/variables.less
View File

@@ -247,8 +247,13 @@
@grid-columns: 12; @grid-columns: 12;
// Padding, to be divided by two and applied to the left and right of all columns // Padding, to be divided by two and applied to the left and right of all columns
@grid-gutter-width: 30px; @grid-gutter-width: 30px;
// Point at which the navbar stops collapsing
// Navbar collapse
// Point at which the navbar becomes uncollapsed
@grid-float-breakpoint: @screen-sm-min; @grid-float-breakpoint: @screen-sm-min;
// Point at which the navbar begins collapsing
@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
// Navbar // Navbar