diff options
| author | Thomas Park <thomas@thomaspark.me> | 2013-10-30 16:13:42 -0400 |
|---|---|---|
| committer | Thomas Park <thomas@thomaspark.me> | 2013-10-30 16:13:42 -0400 |
| commit | 48c64127b37be4a692a70cb7b38ed9744163582b (patch) | |
| tree | dcf4b4b76612269a6b135c695861eca7e89a0cfa /bower_components/bootstrap/examples/grid | |
| parent | 620e501c3d804b1dc2c7d796d7ae378db5e1a040 (diff) | |
3.0.0 -> 3.0.1
Diffstat (limited to 'bower_components/bootstrap/examples/grid')
| -rwxr-xr-x | bower_components/bootstrap/examples/grid/index.html | 53 |
1 files changed, 41 insertions, 12 deletions
diff --git a/bower_components/bootstrap/examples/grid/index.html b/bower_components/bootstrap/examples/grid/index.html index 239b0d16..be1e39c1 100755 --- a/bower_components/bootstrap/examples/grid/index.html +++ b/bower_components/bootstrap/examples/grid/index.html @@ -2,10 +2,11 @@ <html lang="en"> <head> <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="description" content=""> <meta name="author" content=""> - <link rel="shortcut icon" href="../../assets/ico/favicon.png"> + <link rel="shortcut icon" href="../../docs-assets/ico/favicon.png"> <title>Grid Template for Bootstrap</title> @@ -15,10 +16,13 @@ <!-- Custom styles for this template --> <link href="grid.css" rel="stylesheet"> + <!-- Just for debugging purposes. Don't actually copy this line! --> + <!--[if lt IE 9]><script src="../../docs-assets/js/ie8-responsive-file-warning.js"></script><![endif]--> + <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> - <script src="../../assets/js/html5shiv.js"></script> - <script src="../../assets/js/respond.min.js"></script> + <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> + <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script> <![endif]--> </head> @@ -87,8 +91,8 @@ <div class="col-xs-6 col-md-4">.col-xs-6 .col-md-4</div> </div> <div class="row"> - <div class="col-xs-6 col-md-6">.col-xs-6 .col-md-6</div> - <div class="col-xs-6 col-md-6">.col-xs-6 .col-md-6</div> + <div class="col-xs-6">.col-xs-6</div> + <div class="col-xs-6">.col-xs-6</div> </div> <hr> @@ -96,19 +100,44 @@ <h3>Mixed: mobile, tablet, and desktop</h3> <p></p> <div class="row"> - <div class="col-xs-12 col-sm-8 col-lg-8">.col-xs-12 .col-lg-8</div> - <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-lg-4</div> + <div class="col-xs-12 col-sm-6 col-lg-8">.col-xs-12 .col-sm-6 .col-lg-8</div> + <div class="col-xs-6 col-lg-4">.col-xs-6 .col-lg-4</div> + </div> + <div class="row"> + <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div> + <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div> + <div class="col-xs-6 col-sm-4">.col-xs-6 .col-sm-4</div> + </div> + + <hr> + + <h3>Column clearing</h3> + <p>Clear floats at specific breakpoints to prevent awkward wrapping with uneven content.</p> + <div class="row"> + <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div> + <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div> + + <!-- Add the extra clearfix for only the required viewport --> + <div class="clearfix visible-xs"></div> + + <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div> + <div class="col-xs-6 col-sm-3">.col-xs-6 .col-sm-3</div> </div> + + <hr> + + <h3>Offset, push, and pull resets</h3> + <p>Reset offsets, pushes, and pulls at specific breakpoints.</p> <div class="row"> - <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-sm-4 .col-lg-4</div> - <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-sm-4 .col-lg-4</div> - <div class="col-xs-6 col-sm-4 col-lg-4">.col-xs-6 .col-sm-4 .col-lg-4</div> + <div class="col-sm-5 col-md-6">.col-sm-5 .col-md-6</div> + <div class="col-sm-5 col-sm-offset-2 col-md-6 col-md-offset-0">.col-sm-5 .col-sm-offset-2 .col-md-6 .col-md-offset-0</div> </div> <div class="row"> - <div class="col-xs-6 col-sm-6 col-lg-6">.col-xs-6 .col-sm-6 .col-lg-6</div> - <div class="col-xs-6 col-sm-6 col-lg-6">.col-xs-6 .col-sm-6 .col-lg-6</div> + <div class="col-sm-6 col-md-5 col-lg-6">.col-sm-6 .col-md-5 .col-lg-6</div> + <div class="col-sm-6 col-md-5 col-md-offset-2 col-lg-6 col-lg-offset-0">.col-sm-6 .col-md-5 .col-md-offset-2 .col-lg-6 .col-lg-offset-0</div> </div> + </div> <!-- /container --> |