1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 16:50:00 +02:00

Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
	bootstrap.css
	docs/assets/js/application.js
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html
	docs/upgrading.html
This commit is contained in:
Jacob Thornton
2011-12-22 19:15:09 -08:00
17 changed files with 471 additions and 93 deletions

View File

@@ -107,39 +107,23 @@
<div class="marketing">
<h1>Built with Bootstrap</h1>
<ul class="media-grid example-sites">
<li>
<a href="http://kippt.com/" target="_blank">
<p class="built-with">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a>.</p>
<ul class="thumbnails example-sites">
<li class="span4">
<a class="thumbnail" href="http://kippt.com/" target="_blank">
<img src="assets/img/example-sites/kippt.png" alt="Kippt">
</a>
</li>
<li>
<a href="http://www.fleetio.com/" target="_blank">
<li class="span4">
<a class="thumbnail" href="http://www.fleetio.com/" target="_blank">
<img src="assets/img/example-sites/fleetio.png" alt="Fleetio">
</a>
</li>
<li>
<a href="http://www.jshint.com/" target="_blank">
<li class="span4">
<a class="thumbnail" href="http://www.jshint.com/" target="_blank">
<img src="assets/img/example-sites/jshint.png" alt="JS Hint">
</a>
</li>
<!--
<li>
<a href="http://bartop.co/" target="_blank">
<img src="assets/img/example-sites/bartop.png" alt="Bartop.co">
</a>
</li>
<li>
<a href="http://railwayjs.com/" target="_blank">
<img src="assets/img/example-sites/railwayjs.png" alt="RailwayJS">
</a>
</li>
<li>
<a href="http://www.totalwireframe.com/" target="_blank">
<img src="assets/img/example-sites/totalwireframe.png" alt="Total Wireframe">
</a>
</li>
-->
</ul>
<h1>Designed for everyone, everywhere</h1>
@@ -234,5 +218,7 @@
<!-- Le javascript -->
<!-- Placed at the end of the document so the pages load faster -->
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="http://code.jquery.com/jquery-1.7.min.js"></script>
<script src="assets/js/application.js"></script>
</body>
</html>
</html>