fix paths and baseurl action

diff --git a/_config.yml b/_config.yml
index 6fe14e2ad9b32367f57e87e1bcd836f61d796562..6f3b1649ac2b2a2a20e005decfe4cfdc3f81f0f8 100644 (file)
--- 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 3ffdbab2f1aac6710fa40a76b6d614054f465acf..436a5f1777bd9e6da7ea446c8c1be02f9552c5fa 100644 (file)
--- 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 c7ffc32a5564d851e1aeb452153204c1daeabe55..f294bdfea556417f2f731e3256d25b06c00f9305 100644 (file)
--- 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(){