diff options
| author | Mark Otto <[email protected]> | 2014-05-22 23:01:42 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-22 23:01:42 -0700 |
| commit | d66b65ddde1b2f1a5cb14f601d30c552c79d7626 (patch) | |
| tree | d7f07c493e959cebd256939bf28bcbf4af468a28 /docs/_includes/header.html | |
| parent | 91d51d3fba1cc2f80138bb2858ce67c28c9c8a89 (diff) | |
| parent | 10e9fef85c6afde2b3804df928d9351b0f110a6c (diff) | |
| download | bootstrap-d66b65ddde1b2f1a5cb14f601d30c552c79d7626.tar.xz bootstrap-d66b65ddde1b2f1a5cb14f601d30c552c79d7626.zip | |
Merge branch 'master' into icon_paths
Conflicts:
dist/css/bootstrap.css.map
docs/dist/css/bootstrap.css.map
Diffstat (limited to 'docs/_includes/header.html')
| -rw-r--r-- | docs/_includes/header.html | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 182664d5a..b21969451 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -15,6 +15,10 @@ <!-- Bootstrap core CSS --> <link href="../dist/css/bootstrap.min.css" rel="stylesheet"> +{% if page.slug == "css" or page.slug == "components" or page.slug == "js" %} + <!-- Optional Bootstrap Theme --> + <link href="data:text/css;charset=utf-8," data-href="../dist/css/bootstrap-theme.min.css" rel="stylesheet" id="bs-theme-stylesheet"> +{% endif %} <!-- Documentation extras --> <link href="../assets/css/docs.min.css" rel="stylesheet"> @@ -31,7 +35,7 @@ <!-- Favicons --> <link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png"> -<link rel="icon" href="../assets/ico/favicon.ico"> +<link rel="shortcut icon" href="../assets/ico/favicon.ico"> <script> (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |