mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-26 23:04:32 +02:00
Merge branch '2.0-wip'
Conflicts: docs/assets/bootstrap.zip
This commit is contained in:
Jacob Thornton
Binary file not shown.
@@ -61,6 +61,7 @@ hr.soften {
|
||||
position: relative;
|
||||
}
|
||||
.jumbotron h1 {
|
||||
margin-bottom: 9px;
|
||||
font-size: 81px;
|
||||
letter-spacing: -1px;
|
||||
line-height: 1;
|
||||
@@ -568,6 +569,13 @@ form.well {
|
||||
margin-left: 6px;
|
||||
}
|
||||
|
||||
/* Eaxmples page
|
||||
------------------------- */
|
||||
.bootstrap-examples .thumbnail {
|
||||
margin-bottom: 9px;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
|
||||
/* Responsive Docs
|
||||
-------------------------------------------------- */
|
||||
|
||||
BIN
docs/assets/img/examples/bootstrap-example-fluid.jpg
Normal file
BIN
docs/assets/img/examples/bootstrap-example-fluid.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 25 KiB |
BIN
docs/assets/img/examples/bootstrap-example-hero.jpg
Normal file
BIN
docs/assets/img/examples/bootstrap-example-hero.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
BIN
docs/assets/img/examples/bootstrap-example-starter.jpg
Normal file
BIN
docs/assets/img/examples/bootstrap-example-starter.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.0 KiB |
@@ -74,60 +74,35 @@
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div class="alert">
|
||||
<strong>Heads up!</strong> This page is still under construction and is missing plenty of documentation. Hang tight!
|
||||
</div>
|
||||
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<h1>Bootstrap examples</h1>
|
||||
<p class="lead">Use these examples as starting points for your work with Bootstrap. We encourage everyone to iterate on these examples and not simply use them as an end result.</p>
|
||||
<p class="lead">We've included a few basic examples as starting points for your work with Bootstrap. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
|
||||
</header>
|
||||
|
||||
|
||||
<ul class="thumbnails bootstrap-examples">
|
||||
<li class="span4">
|
||||
<a href="../examples/hero.html" class="thumbnail">
|
||||
<img src="http://placehold.it/360x240" alt="">
|
||||
<a class="thumbnail" href="../examples/hero.html">
|
||||
<img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
|
||||
</a>
|
||||
<h3>Basic marketing site</h3>
|
||||
<p></p>
|
||||
<p>Featuring a hero unit for a primary message and three supporting elements.</p>
|
||||
</li>
|
||||
<li class="span4">
|
||||
<a href="../examples/fluid.html" class="thumbnail">
|
||||
<img src="http://placehold.it/360x240" alt="">
|
||||
<a class="thumbnail" href="../examples/fluid.html">
|
||||
<img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
|
||||
</a>
|
||||
<h3>Fluid layout</h3>
|
||||
<p></p>
|
||||
<p>Uses are new responsive, fluid grid system to create seamless liquid layout.</p>
|
||||
</li>
|
||||
<li class="span4">
|
||||
<a href="../examples/fluid-reverse.html" class="thumbnail">
|
||||
<img src="http://placehold.it/360x240" alt="">
|
||||
<a class="thumbnail" href="../examples/starter-template.html">
|
||||
<img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
|
||||
</a>
|
||||
<h3>Fluid layout reversed</h3>
|
||||
<p></p>
|
||||
</li>
|
||||
<li class="span4">
|
||||
<a href="../examples/container-app.html" class="thumbnail">
|
||||
<img src="http://placehold.it/360x240" alt="">
|
||||
</a>
|
||||
<h3>Container application</h3>
|
||||
<p></p>
|
||||
</li>
|
||||
<li class="span4">
|
||||
<a href="#" class="thumbnail">
|
||||
<img src="http://placehold.it/360x240" alt="">
|
||||
</a>
|
||||
<h3>Fullscreen</h3>
|
||||
<p></p>
|
||||
</li>
|
||||
<li class="span4">
|
||||
<a href="#" class="thumbnail">
|
||||
<img src="http://placehold.it/360x240" alt="">
|
||||
</a>
|
||||
<h3>Simple layout</h3>
|
||||
<p></p>
|
||||
<h3>Starter template</h3>
|
||||
<p>A barebones HTML document with all the Bootstrap CSS and javascript included.</p>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
|
||||
@@ -74,10 +74,6 @@
|
||||
|
||||
<div class="container">
|
||||
|
||||
<div class="alert">
|
||||
<strong>Heads up!</strong> This page is still under construction and is missing plenty of documentation. Hang tight!
|
||||
</div>
|
||||
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
|
||||
51
docs/templates/pages/examples.mustache
vendored
51
docs/templates/pages/examples.mustache
vendored
@@ -1,56 +1,31 @@
|
||||
<div class="alert">
|
||||
<strong>Heads up!</strong> This page is still under construction and is missing plenty of documentation. Hang tight!
|
||||
</div>
|
||||
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
<h1>{{_i}}Bootstrap examples{{/i}}</h1>
|
||||
<p class="lead">{{_i}}Use these examples as starting points for your work with Bootstrap. We encourage everyone to iterate on these examples and not simply use them as an end result.{{/i}}</p>
|
||||
<p class="lead">{{_i}}We've included a few basic examples as starting points for your work with Bootstrap. We encourage folks to iterate on these examples and not simply use them as an end result.{{/i}}</p>
|
||||
</header>
|
||||
|
||||
|
||||
<ul class="thumbnails bootstrap-examples">
|
||||
<li class="span4">
|
||||
<a href="../examples/hero.html" class="thumbnail">
|
||||
<img src="http://placehold.it/360x240" alt="">
|
||||
<a class="thumbnail" href="../examples/hero.html">
|
||||
<img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
|
||||
</a>
|
||||
<h3>Basic marketing site</h3>
|
||||
<p></p>
|
||||
<h3>{{_i}}Basic marketing site{{/i}}</h3>
|
||||
<p>{{_i}}Featuring a hero unit for a primary message and three supporting elements.{{/i}}</p>
|
||||
</li>
|
||||
<li class="span4">
|
||||
<a href="../examples/fluid.html" class="thumbnail">
|
||||
<img src="http://placehold.it/360x240" alt="">
|
||||
<a class="thumbnail" href="../examples/fluid.html">
|
||||
<img src="assets/img/examples/bootstrap-example-fluid.jpg" alt="">
|
||||
</a>
|
||||
<h3>Fluid layout</h3>
|
||||
<p></p>
|
||||
<h3>{{_i}}Fluid layout{{/i}}</h3>
|
||||
<p>{{_i}}Uses are new responsive, fluid grid system to create seamless liquid layout.{{/i}}</p>
|
||||
</li>
|
||||
<li class="span4">
|
||||
<a href="../examples/fluid-reverse.html" class="thumbnail">
|
||||
<img src="http://placehold.it/360x240" alt="">
|
||||
<a class="thumbnail" href="../examples/starter-template.html">
|
||||
<img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
|
||||
</a>
|
||||
<h3>Fluid layout reversed</h3>
|
||||
<p></p>
|
||||
</li>
|
||||
<li class="span4">
|
||||
<a href="../examples/container-app.html" class="thumbnail">
|
||||
<img src="http://placehold.it/360x240" alt="">
|
||||
</a>
|
||||
<h3>Container application</h3>
|
||||
<p></p>
|
||||
</li>
|
||||
<li class="span4">
|
||||
<a href="#" class="thumbnail">
|
||||
<img src="http://placehold.it/360x240" alt="">
|
||||
</a>
|
||||
<h3>Fullscreen</h3>
|
||||
<p></p>
|
||||
</li>
|
||||
<li class="span4">
|
||||
<a href="#" class="thumbnail">
|
||||
<img src="http://placehold.it/360x240" alt="">
|
||||
</a>
|
||||
<h3>Simple layout</h3>
|
||||
<p></p>
|
||||
<h3>{{_i}}Starter template{{/i}}</h3>
|
||||
<p>{{_i}}A barebones HTML document with all the Bootstrap CSS and javascript included.{{/i}}</p>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
4
docs/templates/pages/less.mustache
vendored
4
docs/templates/pages/less.mustache
vendored
@@ -1,7 +1,3 @@
|
||||
<div class="alert">
|
||||
<strong>Heads up!</strong> This page is still under construction and is missing plenty of documentation. Hang tight!
|
||||
</div>
|
||||
|
||||
<!-- Masthead
|
||||
================================================== -->
|
||||
<header class="jumbotron subhead" id="overview">
|
||||
|
||||
Reference in New Issue
Block a user