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 /_includes/header.html | |
| 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 '_includes/header.html')
| -rw-r--r-- | _includes/header.html | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/_includes/header.html b/_includes/header.html index 433af17f8..41ecfc8e4 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,4 +1,5 @@ <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=""> @@ -12,24 +13,22 @@ </title> <!-- Bootstrap core CSS --> -<link href="{{ page.base_url }}dist/css/bootstrap.css" rel="stylesheet"> +<link href="{{ page.base_url }}dist/css/bootstrap.min.css" rel="stylesheet"> <!-- Documentation extras --> -<link href="{{ page.base_url }}assets/css/docs.css" rel="stylesheet"> -<link href="{{ page.base_url }}assets/css/pygments-manni.css" rel="stylesheet"> +<link href="{{ page.base_url }}docs-assets/css/docs.css" rel="stylesheet"> +<link href="{{ page.base_url }}docs-assets/css/pygments-manni.css" rel="stylesheet"> +<!--[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="{{ page.base_url }}assets/js/html5shiv.js"></script> - <script src="{{ page.base_url }}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]--> <!-- Favicons --> -<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}assets/ico/apple-touch-icon-144-precomposed.png"> -<link rel="apple-touch-icon-precomposed" sizes="114x114" href="{{ page.base_url }}assets/ico/apple-touch-icon-114-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ page.base_url }}assets/ico/apple-touch-icon-72-precomposed.png"> - <link rel="apple-touch-icon-precomposed" href="{{ page.base_url }}assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="shortcut icon" href="{{ page.base_url }}assets/ico/favicon.png"> +<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ page.base_url }}docs-assets/ico/apple-touch-icon-144-precomposed.png"> + <link rel="shortcut icon" href="{{ page.base_url }}docs-assets/ico/favicon.png"> <script> var _gaq = _gaq || []; |