aboutsummaryrefslogtreecommitdiff
path: root/docs/components.html
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-02 16:04:35 -0800
committerJacob Thornton <[email protected]>2012-01-02 16:04:35 -0800
commitf8c0efbcb45ba81204488b398d1d8ef2950850c6 (patch)
treed41b2270d570ac0ee684664f84c53a1379fcfff1 /docs/components.html
parent2d092dfeea969d82bc55a153c6a597a3e87a0a03 (diff)
parent553030ca7de8dac3c5180629ff84fa14173513ab (diff)
downloadbootstrap-f8c0efbcb45ba81204488b398d1d8ef2950850c6.tar.xz
bootstrap-f8c0efbcb45ba81204488b398d1d8ef2950850c6.zip
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts: bootstrap.css
Diffstat (limited to 'docs/components.html')
-rw-r--r--docs/components.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/components.html b/docs/components.html
index c6a349ff4..fbfa9fb31 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -716,7 +716,7 @@
<p><a class="btn js-btn" href="./javascript.html#modal">Get the javascript &raquo;</a></p>
</div>
<div class="span9">
- <div class="well" style="background-color: #888; border: none; padding: 40px;">
+ <div class="well" style="background-color: #888; border: none; ">
<!-- Modal -->
<div class="modal" style="position: relative; top: auto; left: auto; margin: 0 auto; z-index: 1">
<div class="modal-header">