aboutsummaryrefslogtreecommitdiff
path: root/less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-12-07 20:52:51 -0800
committerMark Otto <[email protected]>2013-12-07 20:52:51 -0800
commit6273604601c58284f49b38ae4e52533b9689437c (patch)
tree9b0c5f07ccad5148345c5b9eafd52b87f2092373 /less
parent73bc7d9f12b24ac71eed830ac1c345e890bc27c3 (diff)
downloadbootstrap-6273604601c58284f49b38ae4e52533b9689437c.tar.xz
bootstrap-6273604601c58284f49b38ae4e52533b9689437c.zip
Add .container-fluid variation for full-width containers and layouts
/cc #10711 #9862
Diffstat (limited to 'less')
-rw-r--r--less/grid.less27
-rw-r--r--less/navbar.less22
2 files changed, 37 insertions, 12 deletions
diff --git a/less/grid.less b/less/grid.less
index 279d80368..dfae6999b 100644
--- a/less/grid.less
+++ b/less/grid.less
@@ -2,7 +2,11 @@
// Grid system
// --------------------------------------------------
-// Set the container width, and override it for fixed navbars in media queries
+
+// Container widths
+//
+// Set the container width, and override it for fixed navbars in media queries.
+
.container {
.container-fixed();
@@ -17,12 +21,30 @@
}
}
-// mobile first defaults
+
+// Fluid container
+//
+// Utilizes the mixin meant for fixed width containers, but without any defined
+// width for fluid, full width layouts.
+
+.container-fluid {
+ .container-fixed();
+}
+
+
+// Row
+//
+// Rows contain and clear the floats of your columns.
+
.row {
.make-row();
}
+
+// Columns
+//
// Common styles for small and large grid columns
+
.make-grid-columns();
@@ -76,4 +98,3 @@
.make-grid(@grid-columns, lg, push);
.make-grid(@grid-columns, lg, offset);
}
-
diff --git a/less/navbar.less b/less/navbar.less
index ea284fede..e9633d855 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -93,14 +93,17 @@
//
// When a container is present, change the behavior of the header and collapse.
-.container > .navbar-header,
-.container > .navbar-collapse {
- margin-right: -@navbar-padding-horizontal;
- margin-left: -@navbar-padding-horizontal;
-
- @media (min-width: @grid-float-breakpoint) {
- margin-right: 0;
- margin-left: 0;
+.container,
+.container-fluid {
+ > .navbar-header,
+ > .navbar-collapse {
+ margin-right: -@navbar-padding-horizontal;
+ margin-left: -@navbar-padding-horizontal;
+
+ @media (min-width: @grid-float-breakpoint) {
+ margin-right: 0;
+ margin-left: 0;
+ }
}
}
@@ -159,7 +162,8 @@
}
@media (min-width: @grid-float-breakpoint) {
- .navbar > .container & {
+ .navbar > .container &,
+ .navbar > .container-fluid & {
margin-left: -@navbar-padding-horizontal;
}
}