diff options
| author | Jacob Thornton <[email protected]> | 2011-12-21 14:03:18 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-12-21 14:03:18 -0800 |
| commit | a5a98a8a984512011dac1216b432b86c6eff96a4 (patch) | |
| tree | 15d14c92a97a0179a0501d8457edc97008a18d91 /docs/scaffolding.html | |
| parent | 80cb760fac507ce207a6174f8886417d32d4b5ed (diff) | |
| parent | 069ef6a020dc177bbf4e18a9b425af36b3395ecf (diff) | |
| download | bootstrap-a5a98a8a984512011dac1216b432b86c6eff96a4.tar.xz bootstrap-a5a98a8a984512011dac1216b432b86c6eff96a4.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'docs/scaffolding.html')
| -rw-r--r-- | docs/scaffolding.html | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 8b7e620fb..7431ae58b 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -64,34 +64,34 @@ <h2>Default 940px grid</h2> <div class="row show-grid"> - <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> - <div class="span1">1</div> + <div class="span1" title="60px">1</div> + <div class="span1" title="60px">1</div> + <div class="span1" title="60px">1</div> + <div class="span1" title="60px">1</div> + <div class="span1" title="60px">1</div> + <div class="span1" title="60px">1</div> + <div class="span1" title="60px">1</div> + <div class="span1" title="60px">1</div> + <div class="span1" title="60px">1</div> + <div class="span1" title="60px">1</div> + <div class="span1" title="60px">1</div> + <div class="span1" title="60px">1</div> </div> <div class="row show-grid"> - <div class="span4">4</div> - <div class="span4">4</div> - <div class="span4">4</div> + <div class="span4" title="300px">4</div> + <div class="span4" title="300px">4</div> + <div class="span4" title="300px">4</div> </div> <div class="row show-grid"> - <div class="span4">4</div> - <div class="span8">8</div> + <div class="span4" title="300px">4</div> + <div class="span8" title="620px">8</div> </div> <div class="row show-grid"> - <div class="span6">6</div> - <div class="span6">6</div> + <div class="span6" title="460px">6</div> + <div class="span6" title="460px">6</div> </div> <div class="row show-grid"> - <div class="span12">12</div> + <div class="span12" title="940px">12</div> </div> <div class="row"> @@ -383,6 +383,17 @@ }); </script> + <script type="text/javascript"> + // Show grid dimensions on hover + $(document).ready(function() { + $('.show-grid > div').hover(function() { + var width = $(this).width(); + $(this).attr('title', width); + $(this).twipsy(); + }); + }); + </script> + <script src="http://autobahn.tablesorter.com/jquery.tablesorter.min.js"></script> <script src="assets/js/google-code-prettify/prettify.js"></script> <script>$(function () { prettyPrint() })</script> |