aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-06-20 23:46:51 -0700
committerMark Otto <[email protected]>2012-06-20 23:46:51 -0700
commit160fe7ca597ff0fdaab0bb49494713724468b05b (patch)
tree2159b5066b523e869bcf2fd8ff81c19fb89285a8 /docs
parent59153205b337df6900a681eb3b3681620bd20ec2 (diff)
downloadbootstrap-160fe7ca597ff0fdaab0bb49494713724468b05b.tar.xz
bootstrap-160fe7ca597ff0fdaab0bb49494713724468b05b.zip
create vars for responsive grid values, fixed and fluid, and document them in the customizer
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap-responsive.css8
-rw-r--r--docs/assets/css/bootstrap.css4
-rw-r--r--docs/download.html16
-rw-r--r--docs/templates/pages/download.mustache16
4 files changed, 41 insertions, 3 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css
index f51ab59a1..2ecc9690e 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -215,7 +215,9 @@
float: left;
margin-left: 20px;
}
- .container {
+ .container,
+ .navbar-fixed-top .container,
+ .navbar-fixed-bottom .container {
width: 724px;
}
.span12 {
@@ -545,7 +547,9 @@
float: left;
margin-left: 30px;
}
- .container {
+ .container,
+ .navbar-fixed-top .container,
+ .navbar-fixed-bottom .container {
width: 1170px;
}
.span12 {
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 74fe73277..404c5eb50 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -194,7 +194,9 @@ a:hover {
margin-left: 20px;
}
-.container {
+.container,
+.navbar-fixed-top .container,
+.navbar-fixed-bottom .container {
width: 940px;
}
diff --git a/docs/download.html b/docs/download.html
index 9c294a8d0..1193e85a3 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -276,11 +276,27 @@
<input type="text" class="span3" placeholder="60px">
<label>@gridGutterWidth</label>
<input type="text" class="span3" placeholder="20px">
+ <label>@gridColumnWidth1200</label>
+ <input type="text" class="span3" placeholder="70px">
+ <label>@gridGutterWidth1200</label>
+ <input type="text" class="span3" placeholder="30px">
+ <label>@gridColumnWidth768</label>
+ <input type="text" class="span3" placeholder="42px">
+ <label>@gridGutterWidth768</label>
+ <input type="text" class="span3" placeholder="20px">
<h3>Fluid grid system</h3>
<label>@fluidGridColumnWidth</label>
<input type="text" class="span3" placeholder="6.382978723%">
<label>@fluidGridGutterWidth</label>
<input type="text" class="span3" placeholder="2.127659574%">
+ <label>@fluidGridColumnWidth1200</label>
+ <input type="text" class="span3" placeholder="5.982905983%">
+ <label>@fluidGridGutterWidth1200</label>
+ <input type="text" class="span3" placeholder="2.564102564%">
+ <label>@fluidGridColumnWidth768</label>
+ <input type="text" class="span3" placeholder="5.801104972%">
+ <label>@fluidGridGutterWidth768</label>
+ <input type="text" class="span3" placeholder="2.762430939%">
<h3>Typography</h3>
<label>@sansFontFamily</label>
diff --git a/docs/templates/pages/download.mustache b/docs/templates/pages/download.mustache
index a01c14ab7..11280434a 100644
--- a/docs/templates/pages/download.mustache
+++ b/docs/templates/pages/download.mustache
@@ -199,11 +199,27 @@
<input type="text" class="span3" placeholder="60px">
<label>@gridGutterWidth</label>
<input type="text" class="span3" placeholder="20px">
+ <label>@gridColumnWidth1200</label>
+ <input type="text" class="span3" placeholder="70px">
+ <label>@gridGutterWidth1200</label>
+ <input type="text" class="span3" placeholder="30px">
+ <label>@gridColumnWidth768</label>
+ <input type="text" class="span3" placeholder="42px">
+ <label>@gridGutterWidth768</label>
+ <input type="text" class="span3" placeholder="20px">
<h3>{{_i}}Fluid grid system{{/i}}</h3>
<label>@fluidGridColumnWidth</label>
<input type="text" class="span3" placeholder="6.382978723%">
<label>@fluidGridGutterWidth</label>
<input type="text" class="span3" placeholder="2.127659574%">
+ <label>@fluidGridColumnWidth1200</label>
+ <input type="text" class="span3" placeholder="5.982905983%">
+ <label>@fluidGridGutterWidth1200</label>
+ <input type="text" class="span3" placeholder="2.564102564%">
+ <label>@fluidGridColumnWidth768</label>
+ <input type="text" class="span3" placeholder="5.801104972%">
+ <label>@fluidGridGutterWidth768</label>
+ <input type="text" class="span3" placeholder="2.762430939%">
<h3>{{_i}}Typography{{/i}}</h3>
<label>@sansFontFamily</label>