More config tweaks.

diff --git a/js/.babelrc b/.babelrc
similarity index 72%
rename from js/.babelrc
rename to .babelrc
index ffc5e3b79956ab4658d13c2b47e2a31ae2bb7d09..eb52c30ac19b542d61dfd84bdf0016216f8b2c72 100644 (file)
--- a/js/.babelrc
+++ b/.babelrc
@@ -3,8 +3,8 @@
     [
       "es2015",
       {
-        "modules": false,
-        "loose": true
+        "loose": true,
+        "modules": false
       }
     ]
   ],

diff --git a/Gruntfile.js b/Gruntfile.js
index 428ef2d5bd71d3ef32c4968bdd671eb0c4efcaa4..7675e2f174e5e7bd93db7e2bf224cb86e7fdfc7a 100644 (file)
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -16,17 +16,8 @@ module.exports = function (grunt) {
     return string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&')
   }
 
-  var path = require('path')
   var isTravis = require('is-travis')
 
-  var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' })
-
-  Object.keys(configBridge.paths).forEach(function (key) {
-    configBridge.paths[key].forEach(function (val, i, arr) {
-      arr[i] = path.join('./docs', val)
-    })
-  })
-
   // Project configuration.
   grunt.initConfig({
 
@@ -75,7 +66,7 @@ module.exports = function (grunt) {
       },
       dist: {
         options: {
-          extends: '../../js/.babelrc'
+          extends: '../../.babelrc'
         },
         files: {
           '<%= concat.bootstrap.dest %>' : '<%= concat.bootstrap.dest %>'

diff --git a/docs/.htmllintrc b/docs/.htmllintrc
index 2a6bb58d6bf7fc8820026cda4362a2008fe0e0e7..e15284536e986c281f3e76d91cd71577b02a52fb 100644 (file)
--- a/docs/.htmllintrc
+++ b/docs/.htmllintrc
@@ -5,7 +5,7 @@
   "class-style": "dash",
   "doctype-first": true,
   "doctype-html5": true,
-  "fig-req-figcaption": true,
+  "fig-req-figcaption": false,
   "html-valid-content-model": false,
   "id-class-ignore-regex": "(onclick|content|[a-z]+([A-Z][a-z])+)",
   "id-class-style": "dash",

diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index 68626962f288706d0d2a95258145dcc54c8bc615..b8603f0d727d02a444147788a65a56b5bb721e22 100644 (file)
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -25,9 +25,10 @@
 {% if site.github %}
   <script src="{{ site.baseurl }}/assets/js/docs.min.js"></script>
 {% else %}
-  {% for file in site.data.configBridge.paths.docsJs %}
-    <script src="{{ site.baseurl }}/{{ file }}"></script>
-  {% endfor %}
+  <script src="{{ site.baseurl }}/assets/js/vendor/anchor.min.js"></script>
+  <script src="{{ site.baseurl }}/assets/js/vendor/clipboard.min.js"></script>
+  <script src="{{ site.baseurl }}/assets/js/vendor/holder.min.js"></script>
+  <script src="{{ site.baseurl }}/assets/js/src/application.js"></script>
 {% endif %}
 
 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->

diff --git a/docs/_plugins/bridge.rb b/docs/_plugins/bridge.rb
deleted file mode 100644 (file)
index 69a13fb..0000000
--- a/docs/_plugins/bridge.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-require 'yaml'
-
-module Bridge
-  class Generator < Jekyll::Generator
-    def generate(site)
-      path = File.join(site.source, "../grunt/configBridge.json")
-      site.data["configBridge"] = YAML.load_file(path)
-    end
-  end
-end

diff --git a/grunt/configBridge.json b/grunt/configBridge.json
deleted file mode 100644 (file)
index 140d9ab..0000000
--- a/grunt/configBridge.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "paths": {
-    "docsJs": [
-      "assets/js/vendor/anchor.min.js",
-      "assets/js/vendor/clipboard.min.js",
-      "assets/js/vendor/holder.min.js",
-      "assets/js/src/application.js"
-    ]
-  }
-}

diff --git a/grunt/upload-preview.sh b/grunt/upload-preview.sh
index 905d716abdf0fec7d91263311f596aaa82701dfc..08e7fa2efd869747e6fba9e7de8b3149852dcf2c 100755 (executable)
--- a/grunt/upload-preview.sh
+++ b/grunt/upload-preview.sh
@@ -6,8 +6,7 @@ if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ]; then exit 0; fi
 # Add build metadata to version
 sed -i "/^current_version:/ s/\$/+pr.${TRAVIS_COMMIT}/" _config.yml
 # Fix URLs since the site's root is now a subdirectory
-echo "baseurl: /c/${TRAVIS_COMMIT}" >> _config.yml
-bundle exec jekyll build --destination "$TRAVIS_COMMIT"
+bundle exec jekyll build --destination "$TRAVIS_COMMIT" --baseurl "/c/${TRAVIS_COMMIT}"
 
 # Install gcloud & gsutil
 GSUTIL_VERSION=$(gsutil version | cut -d ' ' -f 3)