mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-30 15:24:08 +03:00
Code Activity

Merge branch 'master' into derp

Browse Source 
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
parent f26821a83a dcee894a8c
commit f07477d290
7 changed files with 0 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/examples/blog/blog.css
-1
View File
@@ -120,7 +120,6 @@ h6, .h6 {
}
/* Pagination */
.pager {
margin-bottom: 60px;
docs/examples/carousel/carousel.css
-3
View File
@@ -8,7 +8,6 @@ body {
}
/* CUSTOMIZE THE NAVBAR
-------------------------------------------------- */
@@ -62,7 +61,6 @@ body {
}
/* MARKETING CONTENT
-------------------------------------------------- */
@@ -95,7 +93,6 @@ body {
}
/* RESPONSIVE CSS
-------------------------------------------------- */
docs/examples/carousel/index.html
-1
View File
@@ -114,7 +114,6 @@
</div><!-- /.carousel -->
<!-- Marketing messaging and featurettes
================================================== -->
<!-- Wrap the rest of the page in another container to center all the content. -->
docs/examples/offcanvas/index.html
-1
View File
@@ -113,7 +113,6 @@
</div><!--/.container-->
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
docs/examples/theme/index.html
-13
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>