diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/docs.css | 4 | ||||
| -rw-r--r-- | docs/components.html | 179 | ||||
| -rw-r--r-- | docs/javascript.html | 2 | ||||
| -rw-r--r-- | docs/scaffolding.html | 51 | ||||
| -rw-r--r-- | docs/upgrading.html | 152 |
5 files changed, 301 insertions, 87 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 586b5334b..3cf2208e9 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -25,7 +25,7 @@ body > .navbar-fixed .brand { float: right; font-weight: bold; color: #000; - text-shadow: 0 1px 0 rgba(255,255,255,.1); + text-shadow: 0 1px 0 rgba(255,255,255,.1), 0 0 30px rgba(255,255,255,.125); } body > .navbar-fixed .brand:hover { text-decoration: none; @@ -449,7 +449,7 @@ h2 + table { /* Provide enough space on right-hand side for benefits list */ .jumbotron h1, .jumbotron p { - margin-right: 20%; + margin-right: 40%; } } diff --git a/docs/components.html b/docs/components.html index b4a88dd07..56e71b0f7 100644 --- a/docs/components.html +++ b/docs/components.html @@ -58,94 +58,145 @@ ================================================== --> <section id="media"> <div class="page-header"> - <h1>Media <small>Displaying images and videos</small></h1> + <h1>Thumbnails <small>Grids of images, videos, text, and more</small></h1> </div> - <!-- Table structure --> + <div class="row"> - <div class="span3"> - <h2>Media grid</h2> - <p>Display thumbnails of varying sizes on pages with a low HTML footprint and minimal styles.</p> - </div> - <div class="span9"> - <h3>Example thumbnails</h3> - <p>Thumbnails in the <code>.media-grid</code> can be any size, but they work best when mapped directly to the built-in Bootstrap grid system. Image widths like 90, 210, and 330 combine with a few pixels of padding to equal the <code>.span2</code>, <code>.span4</code>, and <code>.span6</code> column sizes.</p> - <h4>Large</h4> - <ul class="media-grid"> - <li> - <a href="#"> - <img class="thumbnail" src="http://placehold.it/330x230" alt=""> + <div class="span6"> + <h2>Default thumbnails</h2> + <p>By default, Bootstrap's thumbnails are designed to showcase linked images with minimal required markup.</p> + <ul class="thumbnails"> + <li class="span3"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/210x150" alt=""> </a> </li> - <li> - <a href="#"> - <img class="thumbnail" src="http://placehold.it/330x230" alt=""> + <li class="span3"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/210x150" alt=""> </a> </li> - </ul> - <h4>Medium</h4> - <ul class="media-grid"> - <li> - <a href="#"> - <img class="thumbnail" src="http://placehold.it/210x150" alt=""> + <li class="span3"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/210x150" alt=""> </a> </li> - <li> - <a href="#"> - <img class="thumbnail" src="http://placehold.it/210x150" alt=""> + <li class="span3"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/210x150" alt=""> </a> </li> - <li> - <a href="#"> - <img class="thumbnail" src="http://placehold.it/210x150" alt=""> + </ul> + </div> + <div class="span6"> + <h2>Highly customizable</h2> + <p>With a bit of extra markup, it's possible to add any kind of HTML content like headings, paragraphs, or buttons into thumbnails.</p> + <ul class="thumbnails"> + <li class="span3"> + <div class="thumbnail"> + <img src="http://placehold.it/210x150" alt=""> + <div class="caption"> + <h5>Thumbnail label</h5> + <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> + <p><a href="#" class="btn primary">Action</a> <a href="#" class="btn">Action</a></p> + </div> + </div> + </li> + <li class="span3"> + <div class="thumbnail"> + <img src="http://placehold.it/210x150" alt=""> + <div class="caption"> + <h5>Thumbnail label</h5> + <p>Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.</p> + <p><a href="#" class="btn primary">Action</a> <a href="#" class="btn">Action</a></p> + </div> + </div> + </li> + </ul> + </div> + </div> + + <div class="row"> + <div class="span4"> + <h3>Why use thumbnails</h3> + <p>Thumbnails (previously <code>.media-grid</code> up until v1.4) are great for grids of photos or videos, image search results, retail products, portfolios, and much more. They can be links or static content.</p> + </div> + <div class="span4"> + <h3>Simple, flexible markup</h3> + <p>Thumbnail markup is simple—a <code>ul</code> with any number of <code>li</code> elements is all that is required. It's also super flexible, allowing for any type of content with just a bit more markup to wrap your contents.</p> + </div> + <div class="span4"> + <h3>Uses grid column sizes</h3> + <p>Lastly, the thumbnails component uses existing grid system classes—like <code>.span2</code> or <code>.span3</code>—for control of thumbnail dimensions.</p> + </div> + </div> + + <div class="row"> + <div class="span6"> + <h2>The markup</h2> + <p>As mentioned previously, the required markup for thumbnails is light and straightforward. Here's a look at the default setup <strong>for linked images</strong>:</p> +<pre class="prettyprint linenums"> +<ul class="thumbnails"> + <li class="span3"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/210x150" alt=""> + </a> + </li> + ... +</ul> +</pre> + <p>For custom HTML content in thumbnails, the markup changes slightly. To allow block level content anywhere, we swap the <code><a></code> for a <code><div></code> like so:</p> +<pre class="prettyprint linenums"> +<ul class="thumbnails"> + <li class="span3"> + <div class="thumbnail"> + <img src="http://placehold.it/210x150" alt=""> + <h5>Thumbnail label</h5> + <p>Thumbnail caption right here...</p> + </div> + </li> + ... +</ul> +</pre> + </div> + <div class="span6"> + <h2>More examples</h2> + <p>Explore all your options with the various grid classes available to you. You can also mix and match different sizes.</p> + <ul class="thumbnails"> + <li class="span4"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/290x230" alt=""> </a> </li> - <li> - <a href="#"> - <img class="thumbnail" src="http://placehold.it/210x150" alt=""> + <li class="span2"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/130x100" alt=""> </a> </li> - <li> - <a href="#"> - <img class="thumbnail" src="http://placehold.it/210x150" alt=""> + <li class="span2"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/130x100" alt=""> </a> </li> - </ul> - <h4>Small</h4> - <ul class="media-grid"> - <li> - <a href="#"> - <img class="thumbnail" src="http://placehold.it/90x90" alt=""> + <li class="span2"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/130x100" alt=""> </a> </li> - <li> - <a href="#"> - <img class="thumbnail" src="http://placehold.it/90x90" alt=""> + <li class="span2"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/130x100" alt=""> </a> </li> - <li> - <a href="#"> - <img class="thumbnail" src="http://placehold.it/90x90" alt=""> + <li class="span2"> + <a href="#" class="thumbnail"> + <img src="http://placehold.it/130x100" alt=""> </a> </li> </ul> - <h4>Coding them</h4> - <p>Media grids are easy to use and rather simple on the markup side. Their dimensions are purely based on the size of the images included.</p> -<pre class="prettyprint linenums"> -<ul class="media-grid"> - <li> - <a href="#"> - <img class="thumbnail" src="http://placehold.it/330x230" alt=""> - </a> - </li> - <li> - <a href="#"> - <img class="thumbnail" src="http://placehold.it/330x230" alt=""> - </a> - </li> -</ul> -</pre> </div> - </div><!-- /row --> + </div> + </section> diff --git a/docs/javascript.html b/docs/javascript.html index 6c0e12c19..56e60e98c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -819,7 +819,7 @@ $('a[data-toggle="tab"]').bind('shown', function (e) { <pre class="prettyprint linenums"><button class="btn" data-complete-text="finished!" >...</button> <script> $('.btn').button('complete') -</scrip></pre> +</script></pre> <h3>Demo</h3> <table class="striped-table"> <tbody> 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> diff --git a/docs/upgrading.html b/docs/upgrading.html new file mode 100644 index 000000000..cd0ca8e22 --- /dev/null +++ b/docs/upgrading.html @@ -0,0 +1,152 @@ +<!DOCTYPE html> +<html lang="en"> + <head> + <meta charset="utf-8"> + <title>Bootstrap, from Twitter: Upgrading from v1.4 to v2.0</title> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> + <meta name="description" content=""> + <meta name="author" content=""> + + <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> + <!--[if lt IE 9]> + <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> + <![endif]--> + + <!-- Le styles --> + <link href="../bootstrap.css" rel="stylesheet"> + <link href="assets/css/docs.css" rel="stylesheet"> + <link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet"> + + <!-- Le fav and touch icons --> + <link rel="shortcut icon" type="image/x-icon" href="assets/ico/favicon.ico"> + <link rel="apple-touch-icon" href="assets/ico/bootstrap-apple-57x57.png"> + <link rel="apple-touch-icon" sizes="72x72" href="assets/ico/bootstrap-apple-72x72.png"> + <link rel="apple-touch-icon" sizes="114x114" href="assets/ico/bootstrap-apple-114x114.png"> + </head> + + <body> + + <!-- Navbar + ================================================== --> + <div class="navbar navbar-fixed"> + <div class="navbar-inner"> + <div class="container"> + <a class="brand" href="./index.html">Bootstrap</a> + <ul class="nav"> + <li><a href="./index.html">Overview</a></li> + <li><a href="./scaffolding.html">Scaffolding</a></li> + <li><a href="./base-css.html">Base CSS</a></li> + <li><a href="./components.html">Components</a></li> + <li><a href="./javascript.html">Javascript plugins</a></li> + <li class="active"><a href="./less.html">Using LESS</a></li> + </ul> + </div> + </div> + </div> + + <div class="container"> + + <!-- Masthead + ================================================== --> + <header class="jumbotron subhead" id="overview"> + <h1>Upgrading to Bootstrap 2</h1> + <p class="lead">Learn about significant changes and additions since v1.4 with this handy guide.</p> + </header> + + +<h2>Rough outline</h2> +<ul> + <li>Docs completely overhauled + <ul> + <li>Responsive thanks to new grid system</li> + <li>Now less marketing and more information</li> + <li>Extensive use of tables to share classes and elements of most components</li> + <li>Broken down into several pages for easier consumption</li> + </ul> + </li> + <li>Updated grid system, now only 12 columns + <ul> + <li>Same great classes, but now only 12 columns</li> + <li>Responsive approach means your projects virtually work out of the box on smartphones, tablets, and more</li> + </ul> + </li> + <li>New thumbnails (previously media grids) + <ul> + <li><code>.media-grid</code> class has been changed to <code>.thumbnails</code></li> + <li>Individual thumbnails now require <code>.thumbnail</code> class</li> + </ul> + </li> + <li>Updated forms + <ul> + <li>Default form style is now stacked to use less CSS and add flexibility</li> + <li>Exact same markup is required for vertical or horizontal forms—just swap the classes</li> + <li>New form defaults for search, inline, vertical, and horizontal</li> + </ul> + </li> + <li>Updated tables + <ul> + <li>Table classes made more consistent</li> + <li>Removed unused table color options (too much code for such little impact)</li> + </ul> + </li> + <li>Typography + <ul> + <li>Right-aligned option for blockquotes if float: right;</li> + </ul> + </li> + <li>Buttons + <ul> + <li>Added button bar options</li> + </ul> + </li> + <li> + <ul> + <li></li> + </ul> + </li> +</ul> + +<!-- + + + +--> + + + + + + <!-- Footer + ================================================== --> + <footer class="footer"> + <p class="pull-right"><a href="#">Back to top</a></p> + <p>Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> + <p>Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> + <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> + </footer> + </div><!-- /container --> + + <!-- Le javascript --> + <!-- Placed at the end of the document so the pages load faster --> + <script src="http://code.jquery.com/jquery-1.5.2.min.js"></script> + + <script type="text/javascript"> + // NOT FINAL BY ANY MEANS, JUST MAH JANK CODE BRO + $(document).ready(function() { + $('.nav .active').click(function(e) { + e.preventDefault(); + $(this).siblings().toggle(); + }); + }); + </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> + <script src="../js/bootstrap-transitions.js"></script> + <script src="../js/bootstrap-dropdown.js"></script> + <script src="../js/bootstrap-twipsy.js"></script> + <script src="../js/bootstrap-scrollspy.js"></script> + <script src="assets/js/application.js"></script> + </body> +</html> |