aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-05 23:50:03 -0800
committerMark Otto <[email protected]>2012-03-05 23:50:03 -0800
commit738fac18de63275fbac8e1f81d60121eff557fd3 (patch)
treef9597e23dbdd9128cc95a0c4e29935c43cf151a2 /docs
parent492ccedcabed8303a9a1cda8a09f6dbd40405553 (diff)
downloadbootstrap-738fac18de63275fbac8e1f81d60121eff557fd3.tar.xz
bootstrap-738fac18de63275fbac8e1f81d60121eff557fd3.zip
move padding from container to body for max-width: 767; responsive layout
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin54895 -> 54951 bytes
-rw-r--r--docs/assets/css/bootstrap-responsive.css9
-rw-r--r--docs/assets/css/bootstrap.css5
-rw-r--r--docs/components.html2
-rw-r--r--docs/templates/pages/components.mustache2
5 files changed, 17 insertions, 1 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index e4d53ed8b..3549d82cc 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 c327f7f07..f087b7373 100644
--- a/docs/assets/css/bootstrap-responsive.css
+++ b/docs/assets/css/bootstrap-responsive.css
@@ -141,9 +141,16 @@
}
}
@media (max-width: 767px) {
+ body {
+ padding-left: 20px;
+ padding-right: 20px;
+ }
+ .navbar-fixed-top {
+ margin-left: -20px;
+ margin-right: -20px;
+ }
.container {
width: auto;
- padding: 0 20px;
}
.row-fluid {
width: 100%;
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index a2d178eb4..ef60ecf47 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3002,6 +3002,11 @@ button.btn.btn-small, input[type="submit"].btn.btn-small {
.pager .previous a {
float: left;
}
+.pager .disabled a, .pager .disabled a:hover {
+ color: #999999;
+ background-color: #fff;
+ cursor: default;
+}
.modal-open .dropdown-menu {
z-index: 2050;
}
diff --git a/docs/components.html b/docs/components.html
index bb3d4c05c..b4071a5a7 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1208,6 +1208,8 @@
<div class="span4">
<h3>About pager</h3>
<p>The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.</p>
+ <h4>Optional disabled state</h4>
+ <p>Pager links also use the general <code>.disabled</code> class from the pagination.</p>
</div>
<div class="span4">
<h3>Default example</h3>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 18b0f7ce4..f38969567 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1132,6 +1132,8 @@
<div class="span4">
<h3>{{_i}}About pager{{/i}}</h3>
<p>{{_i}}The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.{{/i}}</p>
+ <h4>{{_i}}Optional disabled state{{/i}}</h4>
+ <p>{{_i}}Pager links also use the general <code>.disabled</code> class from the pagination.{{/i}}</p>
</div>
<div class="span4">
<h3>{{_i}}Default example{{/i}}</h3>