diff options
| author | Jacob Thornton <[email protected]> | 2011-09-10 22:44:22 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-10 22:44:22 -0700 |
| commit | 68865002af6423c8c082a68acebe0f987670b591 (patch) | |
| tree | 6935e486717334a2ed74aba786e19c1393d7dbaf /docs | |
| parent | 265511774715b8cbe7cbabb9b2a1bf2f27c28c1e (diff) | |
| parent | 3755ee158f947bdb1d44b86faa9537ac9f3cbbc5 (diff) | |
| download | bootstrap-68865002af6423c8c082a68acebe0f987670b591.tar.xz bootstrap-68865002af6423c8c082a68acebe0f987670b591.zip | |
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.html | 53 |
1 files changed, 50 insertions, 3 deletions
diff --git a/docs/index.html b/docs/index.html index 5e8d1f770..394d37ae6 100644 --- a/docs/index.html +++ b/docs/index.html @@ -42,11 +42,12 @@ <div class="container"> <h3><a href="#">Bootstrap</a></h3> <ul class="nav"> - <li class="active"><a href="#masthead">Overview</a></li> + <li class="active"><a href="#overview">Overview</a></li> <li><a href="#about">About</a></li> <li><a href="#grid-system">Grid</a></li> <li><a href="#layouts">Layouts</a></li> - <li><a href="#typography">Typography</a></li> + <li><a href="#typography">Type</a></li> + <li><a href="#media">Media</a></li> <li><a href="#tables">Tables</a></li> <li><a href="#forms">Forms</a></li> <li><a href="#navigation">Navigation</a></li> @@ -61,7 +62,7 @@ <!-- Masthead (blueprinty thing) ================================================== --> - <header class="jumbotron masthead"> + <header class="jumbotron masthead" id="overview"> <div class="inner"> <div class="container"> <h1>Bootstrap, from Twitter</h1> @@ -698,6 +699,52 @@ +<!-- Media +================================================== --> +<section id="media"> + <div class="page-header"> + <h1>Media <small>Displaying images and videos</small></h1> + </div> + <!-- Table structure --> + <div class="row"> + <div class="span4"> + <h2>Media grid</h2> + <p>Display thumbnails of varying sizes on pages with a low HTML footprint and minimal styles.</p> + </div> + <div class="span12"> + <ul class="media-grid"> + <li> + <a class="thumbnail" href="#"> + <img src="http://placehold.it/210x150" alt=""> + </a> + </li> + <li> + <a class="thumbnail" href="#"> + <img src="http://placehold.it/210x150" alt=""> + </a> + </li> + <li> + <a class="thumbnail" href="#"> + <img src="http://placehold.it/210x150" alt=""> + </a> + </li> + <li> + <a class="thumbnail" href="#"> + <img src="http://placehold.it/210x150" alt=""> + </a> + </li> + <li> + <a class="thumbnail" href="#"> + <img src="http://placehold.it/210x150" alt=""> + </a> + </li> + </ul> + </div> + </div><!-- /row --> +</section> + + + <!-- Tables ================================================== --> <section id="tables"> |