diff options
| author | Mark Otto <[email protected]> | 2014-07-09 10:48:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-09 10:48:58 -0700 |
| commit | 41f3af407bab6c77f61b1d1fc8d3526f5276076f (patch) | |
| tree | cb9a982f2fc56ec1ce71849d37dc06b47d313cf3 /docs/_includes/header.html | |
| parent | 0e47ce959ce6257c8fdde13b1362dbbe19fb56e3 (diff) | |
| parent | 87c9ce5333139eede2f02d6812c083a86db61cdf (diff) | |
| download | bootstrap-41f3af407bab6c77f61b1d1fc8d3526f5276076f.tar.xz bootstrap-41f3af407bab6c77f61b1d1fc8d3526f5276076f.zip | |
Merge branch 'derp' into derp_navs
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 | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 406b84cda..47e7e9839 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -21,31 +21,20 @@ {% endif %} {% if page.slug == "css" or page.slug == "components" or page.slug == "js" %} <!-- Optional Bootstrap Theme --> -{% if site.github %} - <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.min.css" rel="stylesheet" id="bs-theme-stylesheet"> -{% else %} - <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.css" rel="stylesheet" id="bs-theme-stylesheet"> -{% endif %} + {% if site.github %} + <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.min.css" rel="stylesheet" id="bs-theme-stylesheet"> + {% else %} + <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.css" rel="stylesheet" id="bs-theme-stylesheet"> + {% endif %} {% endif %} <!-- Documentation extras --> -{% if site.github %} <link href="../assets/css/docs.min.css" rel="stylesheet"> -{% else %} -<link href="../assets/css/src/docs.css" rel="stylesheet"> -<link href="../assets/css/src/pygments-manni.css" rel="stylesheet"> -{% endif %} -<!--[if lt IE 9]><script src="../assets/js/ie8-responsive-file-warning.js"></script><![endif]--> + <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <script src="../assets/js/ie10-viewport-bug-workaround.js"></script> <script src="../assets/js/ie-emulation-modes-warning.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/html5shiv/3.7.2/html5shiv.min.js"></script> - <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> -<![endif]--> - <!-- Favicons --> <link rel="apple-touch-icon-precomposed" href="/apple-touch-icon-precomposed.png"> <link rel="icon" href="/favicon.ico"> |