diff options
| author | Mark Otto <[email protected]> | 2014-10-26 22:59:02 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-10-26 22:59:02 -0700 |
| commit | f07477d29072bc0a7b57bd17988c6d01f7b18266 (patch) | |
| tree | 5c5cbc9f08e1e07cedf29b301b5273758881eee9 /docs/examples/theme | |
| parent | f26821a83a5766f0ce2b68aff12577679b6d8282 (diff) | |
| parent | dcee894a8ca811abcc47ac59f63bb3918efafab1 (diff) | |
| download | bootstrap-f07477d29072bc0a7b57bd17988c6d01f7b18266.tar.xz bootstrap-f07477d29072bc0a7b57bd17988c6d01f7b18266.zip | |
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
Diffstat (limited to 'docs/examples/theme')
| -rw-r--r-- | docs/examples/theme/index.html | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/docs/examples/theme/index.html b/docs/examples/theme/index.html index 7b817f4b9..645c1024e 100644 --- a/docs/examples/theme/index.html +++ b/docs/examples/theme/index.html @@ -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> |