diff options
| author | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
| commit | 81b59d35368bc51d361d0352cc92fe99dc580fbf (patch) | |
| tree | 2395d5e79edaaa8c0a7ad82e99931ec895421532 /docs/examples/grid | |
| parent | fed2b0f7eb78438eb1b768782b04651881d88740 (diff) | |
| parent | ddee04038f946ac103eb4e70c8eb7adeb2cf563b (diff) | |
| download | bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.tar.xz bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/docs.min.js
docs/assets/js/src/application.js
Diffstat (limited to 'docs/examples/grid')
| -rw-r--r-- | docs/examples/grid/grid.css | 5 | ||||
| -rw-r--r-- | docs/examples/grid/index.html | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/docs/examples/grid/grid.css b/docs/examples/grid/grid.css index a7a106d06..b25263bc7 100644 --- a/docs/examples/grid/grid.css +++ b/docs/examples/grid/grid.css @@ -1,8 +1,3 @@ -.container { - padding-right: 15px; - padding-left: 15px; -} - h4 { margin-top: 25px; } diff --git a/docs/examples/grid/index.html b/docs/examples/grid/index.html index 54bdfbe0a..2dff5df9b 100644 --- a/docs/examples/grid/index.html +++ b/docs/examples/grid/index.html @@ -6,7 +6,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content=""> <meta name="author" content=""> - <link rel="shortcut icon" href="../../assets/ico/favicon.ico"> + <link rel="icon" href="../../favicon.ico"> <title>Grid Template for Bootstrap</title> @@ -16,13 +16,17 @@ <!-- Custom styles for this template --> <link href="grid.css" rel="stylesheet"> - <!-- Just for debugging purposes. Don't actually copy this line! --> + <!-- Just for debugging purposes. Don't actually copy these 2 lines! --> <!--[if lt IE 9]><script src="../../assets/js/ie8-responsive-file-warning.js"></script><![endif]--> + <script src="../../assets/js/ie-emulation-modes-warning.js"></script> + + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> + <script src="../../assets/js/ie10-viewport-bug-workaround.js"></script> <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries --> <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> - <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> + <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> </head> |