0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-20 17:54:23 +01:00

fix paths and baseurl action

This commit is contained in:
Mark Otto 2014-12-19 00:24:09 -08:00
parent 547f16b58e
commit d1a766494e
3 changed files with 15 additions and 15 deletions

View File

@ -13,7 +13,7 @@ source: docs
destination: _gh_pages destination: _gh_pages
host: 0.0.0.0 host: 0.0.0.0
port: 9001 port: 9001
baseurl: / baseurl: ""
url: http://getbootstrap.com url: http://getbootstrap.com
encoding: UTF-8 encoding: UTF-8
exclude: [assets/less/, assets/js/src/] exclude: [assets/less/, assets/js/src/]

View File

@ -34,21 +34,21 @@
<!-- Placed at the end of the document so the pages load faster --> <!-- 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> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
{% if site.github %} {% if site.github %}
<script src="../dist/js/bootstrap.min.js"></script> <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script>
{% else %} {% else %}
<script src="../dist/js/bootstrap.js"></script> <script src="{{ site.baseurl }}/dist/js/bootstrap.js"></script>
{% endif %} {% endif %}
{% if site.github %} {% if site.github %}
<script src="../assets/js/docs.min.js"></script> <script src="{{ site.baseurl }}/assets/js/docs.min.js"></script>
{% else %} {% else %}
{% for file in site.data.configBridge.paths.docsJs %} <script src="{{ site.baseurl }}/assets/js/vendor/holder.js"></script>
<script src="{{ file }}"></script> <script src="{{ site.baseurl }}/assets/js/vendor/ZeroClipboard.min.js"></script>
{% endfor %} <script src="{{ site.baseurl }}/assets/js/src/application.js"></script>
{% endif %} {% endif %}
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> <!-- 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 %} {% comment %}
Inject Twitter widgets asynchronously. Snippet snipped from Twitter's Inject Twitter widgets asynchronously. Snippet snipped from Twitter's

View File

@ -15,21 +15,21 @@
<!-- Bootstrap core CSS --> <!-- Bootstrap core CSS -->
{% if jekyll.environment == "development" %} {% 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 %} {% else %}
<link href="{{ site.baseurl }}dist/css/bootstrap.min.css" rel="stylesheet"> <link href="{{ site.baseurl }}/dist/css/bootstrap.min.css" rel="stylesheet">
{% endif %} {% endif %}
<!-- Documentation extras --> <!-- 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 --> <!-- 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/ie10-viewport-bug-workaround.js"></script>
<script src="{{ site.baseurl }}assets/js/ie-emulation-modes-warning.js"></script> <script src="{{ site.baseurl }}/assets/js/ie-emulation-modes-warning.js"></script>
<!-- Favicons --> <!-- Favicons -->
<link rel="apple-touch-icon-precomposed" href="{{ site.baseurl }}apple-touch-icon-precomposed.png"> <link rel="apple-touch-icon-precomposed" href="{{ site.baseurl }}/apple-touch-icon-precomposed.png">
<link rel="icon" href="{{ site.baseurl }}favicon.ico"> <link rel="icon" href="{{ site.baseurl }}/favicon.ico">
<script> <script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){