diff options
| author | Mark Otto <[email protected]> | 2014-12-19 00:24:09 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-12-19 00:24:09 -0800 |
| commit | d1a766494e7b34fc39bad97584de4683b204da79 (patch) | |
| tree | 67206ef476dcf606e9365bb7a78717f4f63e79e0 | |
| parent | 547f16b58e54375b1d523cc6e2153993bf731875 (diff) | |
| download | bootstrap-d1a766494e7b34fc39bad97584de4683b204da79.tar.xz bootstrap-d1a766494e7b34fc39bad97584de4683b204da79.zip | |
fix paths and baseurl action
| -rw-r--r-- | _config.yml | 2 | ||||
| -rw-r--r-- | docs/_includes/footer.html | 14 | ||||
| -rw-r--r-- | docs/_includes/header.html | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/_config.yml b/_config.yml index 6fe14e2ad..6f3b1649a 100644 --- a/_config.yml +++ b/_config.yml @@ -13,7 +13,7 @@ source: docs destination: _gh_pages host: 0.0.0.0 port: 9001 -baseurl: / +baseurl: "" url: http://getbootstrap.com encoding: UTF-8 exclude: [assets/less/, assets/js/src/] diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 3ffdbab2f..436a5f177 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -34,21 +34,21 @@ <!-- Placed at the end of the document so the pages load faster --> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script> {% if site.github %} - <script src="../dist/js/bootstrap.min.js"></script> + <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script> {% else %} - <script src="../dist/js/bootstrap.js"></script> + <script src="{{ site.baseurl }}/dist/js/bootstrap.js"></script> {% endif %} {% if site.github %} - <script src="../assets/js/docs.min.js"></script> + <script src="{{ site.baseurl }}/assets/js/docs.min.js"></script> {% else %} - {% for file in site.data.configBridge.paths.docsJs %} - <script src="{{ file }}"></script> - {% endfor %} + <script src="{{ site.baseurl }}/assets/js/vendor/holder.js"></script> + <script src="{{ site.baseurl }}/assets/js/vendor/ZeroClipboard.min.js"></script> + <script src="{{ site.baseurl }}/assets/js/src/application.js"></script> {% endif %} <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> -<script src="../assets/js/ie10-viewport-bug-workaround.js"></script> +<script src="{{ site.baseurl }}/assets/js/ie10-viewport-bug-workaround.js"></script> {% comment %} Inject Twitter widgets asynchronously. Snippet snipped from Twitter's diff --git a/docs/_includes/header.html b/docs/_includes/header.html index c7ffc32a5..f294bdfea 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -15,21 +15,21 @@ <!-- Bootstrap core CSS --> {% if jekyll.environment == "development" %} -<link href="{{ site.baseurl }}dist/css/bootstrap.css" rel="stylesheet"> +<link href="{{ site.baseurl }}/dist/css/bootstrap.css" rel="stylesheet"> {% else %} -<link href="{{ site.baseurl }}dist/css/bootstrap.min.css" rel="stylesheet"> +<link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet"> {% endif %} <!-- Documentation extras --> -<link href="{{ site.baseurl }}assets/css/docs.min.css" rel="stylesheet"> +<link href="{{ site.baseurl }}/assets/css/docs.min.css" rel="stylesheet"> <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> -<script src="{{ site.baseurl }}assets/js/ie10-viewport-bug-workaround.js"></script> -<script src="{{ site.baseurl }}assets/js/ie-emulation-modes-warning.js"></script> +<script src="{{ site.baseurl }}/assets/js/ie10-viewport-bug-workaround.js"></script> +<script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script> <!-- Favicons --> -<link rel="apple-touch-icon-precomposed" href="{{ site.baseurl }}apple-touch-icon-precomposed.png"> -<link rel="icon" href="{{ site.baseurl }}favicon.ico"> +<link rel="apple-touch-icon-precomposed" href="{{ site.baseurl }}/apple-touch-icon-precomposed.png"> +<link rel="icon" href="{{ site.baseurl }}/favicon.ico"> <script> (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ |