diff --git a/js/.babelrc b/.babelrc
similarity index 72%
rename from js/.babelrc
rename to .babelrc
index ffc5e3b799..eb52c30ac1 100644
--- 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 428ef2d5bd..7675e2f174 100644
--- 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 2a6bb58d6b..e15284536e 100644
--- 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 68626962f2..b8603f0d72 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -25,9 +25,10 @@
{% if site.github %}
{% else %}
- {% for file in site.data.configBridge.paths.docsJs %}
-
- {% endfor %}
+
+
+
+
{% endif %}
diff --git a/docs/_plugins/bridge.rb b/docs/_plugins/bridge.rb
deleted file mode 100644
index 69a13fbbbd..0000000000
--- 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
index 140d9ab78a..0000000000
--- 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 905d716abd..08e7fa2efd 100755
--- 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)