diff options
| author | Mark Otto <[email protected]> | 2014-02-08 16:52:22 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-08 16:52:22 -0800 |
| commit | e9199718d64dadc22d61b4cea8c77a2307455823 (patch) | |
| tree | b10f0174a9d564da40df55d658136fef74b6adb9 /docs/_includes/header.html | |
| parent | 4787a69efbe0fcd81228781b3c91dfe198aa0f1b (diff) | |
| parent | 7f88009394e72395aa7a458ae442b0c3037dbd15 (diff) | |
| download | bootstrap-e9199718d64dadc22d61b4cea8c77a2307455823.tar.xz bootstrap-e9199718d64dadc22d61b4cea8c77a2307455823.zip | |
Merge branch 'master' into fix-12154
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/_includes/header.html')
| -rw-r--r-- | docs/_includes/header.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 9b1b5fddd..defb549ae 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -1,6 +1,6 @@ <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="viewport" content="width=device-width, initial-scale=1"> <meta name="description" content="Bootstrap, a sleek, intuitive, and powerful mobile first front-end framework for faster and easier web development."> <meta name="keywords" content="HTML, CSS, JS, JavaScript, framework, bootstrap, front-end, frontend, web development"> <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors"> @@ -14,11 +14,11 @@ </title> <!-- Bootstrap core CSS --> -<link href="{{ site.baseurl }}dist/css/bootstrap.min.css" rel="stylesheet"> +<link href="../dist/css/bootstrap.min.css" rel="stylesheet"> <!-- Documentation extras --> -<link href="{{ site.baseurl }}assets/css/pack.min.css" rel="stylesheet"> -<!--[if lt IE 9]><script src="{{ site.baseurl }}assets/js/ie8-responsive-file-warning.js"></script><![endif]--> +<link href="../assets/css/docs.min.css" rel="stylesheet"> +<!--[if lt IE 9]><script src="../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]> @@ -27,8 +27,8 @@ <![endif]--> <!-- Favicons --> -<link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ site.baseurl }}assets/ico/apple-touch-icon-144-precomposed.png"> - <link rel="shortcut icon" href="{{ site.baseurl }}assets/ico/favicon.ico"> +<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> + <link rel="shortcut icon" href="../assets/ico/favicon.ico"> <script> var _gaq = _gaq || []; |