aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css/docs.css
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-09-02 21:06:49 -0700
committerJacob Thornton <[email protected]>2011-09-02 21:06:49 -0700
commit3c9c85b1ed85ae633d4b94f421020b84d24d9a5c (patch)
tree732ffc524a99cc48934a157deeb89372968af322 /docs/assets/css/docs.css
parentc4481b54a8c2cf05bd12d04196e3234523d27653 (diff)
parent41242b5ce6411efcd66d985dd6853191de67fbbf (diff)
downloadbootstrap-3c9c85b1ed85ae633d4b94f421020b84d24d9a5c.tar.xz
bootstrap-3c9c85b1ed85ae633d4b94f421020b84d24d9a5c.zip
Merge branch 'js-examples' into 1.3-wip
Conflicts: bootstrap-1.2.0.css
Diffstat (limited to 'docs/assets/css/docs.css')
-rw-r--r--docs/assets/css/docs.css1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index bdb655b1a..f72cd3953 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -130,6 +130,7 @@ div.quickstart form textarea {
#footer p.right {
float: right;
}
+
/* Special grid styles
-------------------------------------------------- */
.show-grid {