0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-10 22:24:19 +01:00

Merge branch 'remove-body-content' of https://github.com/lipis/bootstrap into lipis-remove-body-content

This commit is contained in:
Mark Otto 2013-08-18 10:00:30 -07:00
commit 8ae9736ead
3 changed files with 38 additions and 62 deletions

View File

@ -75,8 +75,6 @@
</div> </div>
<div class="container"> <div class="container">
<div class="body-content">
<!-- Example row of columns --> <!-- Example row of columns -->
<div class="row"> <div class="row">
<div class="col-lg-4"> <div class="col-lg-4">
@ -101,8 +99,6 @@
<footer> <footer>
<p>&copy; Company 2013</p> <p>&copy; Company 2013</p>
</footer> </footer>
</div>
</div> <!-- /container --> </div> <!-- /container -->

View File

@ -3,18 +3,3 @@ body {
padding-top: 50px; padding-top: 50px;
padding-bottom: 20px; padding-bottom: 20px;
} }
/* Wrapping element */
/* Set some basic padding to keep content from hitting the edges */
.body-content {
padding-left: 15px;
padding-right: 15px;
}
/* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) {
/* Remove padding from wrapping element since we kick in the grid classes here */
.body-content {
padding: 0;
}
}

View File

@ -45,9 +45,6 @@
<p><a class="btn btn-lg btn-success" href="#">Get started today</a></p> <p><a class="btn btn-lg btn-success" href="#">Get started today</a></p>
</div> </div>
<div class="body-content">
<!-- Example row of columns --> <!-- Example row of columns -->
<div class="row"> <div class="row">
<div class="col-lg-4"> <div class="col-lg-4">
@ -67,8 +64,6 @@
</div> </div>
</div> </div>
</div><!-- /.body-content -->
<!-- Site footer --> <!-- Site footer -->
<div class="footer"> <div class="footer">
<p>&copy; Company 2013</p> <p>&copy; Company 2013</p>