aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-25 16:40:51 -0700
committerMark Otto <[email protected]>2012-03-25 16:41:46 -0700
commit95c2877ffca46aa5812b0b2b2ace6608d309586d (patch)
treeaf696a7337585f486a945cd8a2fc85be0439e10d
parent8d52e6d458e10c618698cc7698f252003e727eb7 (diff)
downloadbootstrap-95c2877ffca46aa5812b0b2b2ace6608d309586d.tar.xz
bootstrap-95c2877ffca46aa5812b0b2b2ace6608d309586d.zip
remove > in fluid grid selectors, fix double padding issue on fluid layout and example
-rw-r--r--docs/assets/bootstrap.zipbin56850 -> 56863 bytes
-rw-r--r--docs/assets/css/bootstrap-responsive.css11
-rw-r--r--docs/assets/css/bootstrap.css4
-rw-r--r--less/mixins.less4
-rw-r--r--less/responsive-767px-max.less5
5 files changed, 16 insertions, 8 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 453230366..49bc25fb0 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index c374fb8e5..560bd7566 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -136,6 +136,9 @@
margin-left: -20px;
margin-right: -20px;
}
+ .container-fluid {
+ padding: 0;
+ }
.container {
width: auto;
}
@@ -282,11 +285,11 @@
.row-fluid:after {
clear: both;
}
- .row-fluid > [class*="span"] {
+ .row-fluid [class*="span"] {
float: left;
margin-left: 2.762430939%;
}
- .row-fluid > [class*="span"]:first-child {
+ .row-fluid [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid > .span12 {
@@ -473,11 +476,11 @@
.row-fluid:after {
clear: both;
}
- .row-fluid > [class*="span"] {
+ .row-fluid [class*="span"] {
float: left;
margin-left: 2.564102564%;
}
- .row-fluid > [class*="span"]:first-child {
+ .row-fluid [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid > .span12 {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 355c82415..3bfd6960e 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -253,11 +253,11 @@ a:hover {
.row-fluid:after {
clear: both;
}
-.row-fluid > [class*="span"] {
+.row-fluid [class*="span"] {
float: left;
margin-left: 2.127659574%;
}
-.row-fluid > [class*="span"]:first-child {
+.row-fluid [class*="span"]:first-child {
margin-left: 0;
}
.row-fluid > .span12 {
diff --git a/less/mixins.less b/less/mixins.less
index f3774a533..8e72f23cc 100644
--- a/less/mixins.less
+++ b/less/mixins.less
@@ -578,11 +578,11 @@
.row-fluid {
width: 100%;
.clearfix();
- > [class*="span"] {
+ [class*="span"] {
float: left;
margin-left: @fluidGridGutterWidth;
}
- > [class*="span"]:first-child {
+ [class*="span"]:first-child {
margin-left: 0;
}
diff --git a/less/responsive-767px-max.less b/less/responsive-767px-max.less
index bb4a449f8..7a3318a8f 100644
--- a/less/responsive-767px-max.less
+++ b/less/responsive-767px-max.less
@@ -75,11 +75,16 @@
padding-left: 20px;
padding-right: 20px;
}
+ // Negative indent the now static "fixed" navbar
.navbar-fixed-top,
.navbar-fixed-bottom {
margin-left: -20px;
margin-right: -20px;
}
+ // Remove padding on container given explicit padding set on body
+ .container-fluid {
+ padding: 0;
+ }
// GRID & CONTAINERS
// -----------------