1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-10-03 08:41:59 +02:00

Merge branch 'master' into derp

Conflicts:
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap.css.map
	docs/assets/js/raw-files.min.js
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap.css.map
	less/progress-bars.less
	less/theme.less
This commit is contained in:
Mark Otto
2014-10-26 22:59:02 -07:00
7 changed files with 0 additions and 245 deletions

View File

@@ -68,7 +68,6 @@
</div>
<div class="page-header">
<h1>Buttons</h1>
</div>
@@ -110,7 +109,6 @@
</p>
<div class="page-header">
<h1>Tables</h1>
</div>
@@ -252,14 +250,12 @@
</div>
<div class="page-header">
<h1>Thumbnails</h1>
</div>
<img data-src="holder.js/200x200" class="img-thumbnail" alt="A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera">
<div class="page-header">
<h1>Labels</h1>
</div>
@@ -321,7 +317,6 @@
</p>
<div class="page-header">
<h1>Badges</h1>
</div>
@@ -350,7 +345,6 @@
</div>
<div class="page-header">
<h1>Navs</h1>
</div>
@@ -366,7 +360,6 @@
</ul>
<div class="page-header">
<h1>Navbars</h1>
</div>
@@ -438,7 +431,6 @@
</nav>
<div class="page-header">
<h1>Alerts</h1>
</div>
@@ -456,7 +448,6 @@
</div>
<div class="page-header">
<h1>Progress bars</h1>
</div>
@@ -485,7 +476,6 @@
</div>
<div class="page-header">
<h1>List groups</h1>
</div>
@@ -529,7 +519,6 @@
</div>
<div class="page-header">
<h1>Panels</h1>
</div>
@@ -591,7 +580,6 @@
</div>
<div class="page-header">
<h1>Wells</h1>
</div>
@@ -600,7 +588,6 @@
</div>
<div class="page-header">
<h1>Carousel</h1>
</div>