diff options
| author | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-20 22:55:45 -0700 |
| commit | 2eec3f919e7bd7ee847c2631ae9c53515cac1c8f (patch) | |
| tree | b9dd9c6b61fcb72aafe47dd85beac8cfb9da4fe2 /examples/grid | |
| parent | ab3d0a27b3d93eebff3852728f94ddc4fcb35199 (diff) | |
| parent | 6585c5898a47deb2df5f7db4f9ef3fe8fa1e5a4a (diff) | |
| download | bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.tar.xz bootstrap-2eec3f919e7bd7ee847c2631ae9c53515cac1c8f.zip | |
Merge branch 'master' into pr/10656
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'examples/grid')
| -rw-r--r-- | examples/grid/index.html | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/examples/grid/index.html b/examples/grid/index.html index 7fc46c684..d3159e631 100644 --- a/examples/grid/index.html +++ b/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="{{ page.base_url }}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,17 +100,13 @@ <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> - <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-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-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-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> |