Skip to content

Commit cab6f7d

Browse files
committed
More config tweaks.
1 parent 1ecb74e commit cab6f7d

File tree

7 files changed

+9
-38
lines changed

7 files changed

+9
-38
lines changed

js/.babelrc .babelrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
[
44
"es2015",
55
{
6-
"modules": false,
7-
"loose": true
6+
"loose": true,
7+
"modules": false
88
}
99
]
1010
],

Gruntfile.js

+1-10
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,8 @@ module.exports = function (grunt) {
1616
return string.replace(/[-\\^$*+?.()|[\]{}]/g, '\\$&')
1717
}
1818

19-
var path = require('path')
2019
var isTravis = require('is-travis')
2120

22-
var configBridge = grunt.file.readJSON('./grunt/configBridge.json', { encoding: 'utf8' })
23-
24-
Object.keys(configBridge.paths).forEach(function (key) {
25-
configBridge.paths[key].forEach(function (val, i, arr) {
26-
arr[i] = path.join('./docs', val)
27-
})
28-
})
29-
3021
// Project configuration.
3122
grunt.initConfig({
3223

@@ -75,7 +66,7 @@ module.exports = function (grunt) {
7566
},
7667
dist: {
7768
options: {
78-
extends: '../../js/.babelrc'
69+
extends: '../../.babelrc'
7970
},
8071
files: {
8172
'<%= concat.bootstrap.dest %>' : '<%= concat.bootstrap.dest %>'

docs/.htmllintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"class-style": "dash",
66
"doctype-first": true,
77
"doctype-html5": true,
8-
"fig-req-figcaption": true,
8+
"fig-req-figcaption": false,
99
"html-valid-content-model": false,
1010
"id-class-ignore-regex": "(onclick|content|[a-z]+([A-Z][a-z])+)",
1111
"id-class-style": "dash",

docs/_includes/footer.html

+4-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
{% if site.github %}
2626
<script src="{{ site.baseurl }}/assets/js/docs.min.js"></script>
2727
{% else %}
28-
{% for file in site.data.configBridge.paths.docsJs %}
29-
<script src="{{ site.baseurl }}/{{ file }}"></script>
30-
{% endfor %}
28+
<script src="{{ site.baseurl }}/assets/js/vendor/anchor.min.js"></script>
29+
<script src="{{ site.baseurl }}/assets/js/vendor/clipboard.min.js"></script>
30+
<script src="{{ site.baseurl }}/assets/js/vendor/holder.min.js"></script>
31+
<script src="{{ site.baseurl }}/assets/js/src/application.js"></script>
3132
{% endif %}
3233

3334
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->

docs/_plugins/bridge.rb

-10
This file was deleted.

grunt/configBridge.json

-10
This file was deleted.

grunt/upload-preview.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ]; then exit 0; fi
66
# Add build metadata to version
77
sed -i "/^current_version:/ s/\$/+pr.${TRAVIS_COMMIT}/" _config.yml
88
# Fix URLs since the site's root is now a subdirectory
9-
echo "baseurl: /c/${TRAVIS_COMMIT}" >> _config.yml
10-
bundle exec jekyll build --destination "$TRAVIS_COMMIT"
9+
bundle exec jekyll build --destination "$TRAVIS_COMMIT" --baseurl "/c/${TRAVIS_COMMIT}"
1110

1211
# Install gcloud & gsutil
1312
GSUTIL_VERSION=$(gsutil version | cut -d ' ' -f 3)

0 commit comments

Comments
 (0)