Skip to content

Commit

Permalink
More config tweaks.
Browse files Browse the repository at this point in the history
  • Loading branch information
bardiharborow committed Mar 21, 2017
1 parent 1ecb74e commit cab6f7d
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 38 deletions.
4 changes: 2 additions & 2 deletions js/.babelrc → .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
[
"es2015",
{
"modules": false,
"loose": true
"loose": true,
"modules": false
}
]
],
Expand Down
11 changes: 1 addition & 10 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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({

Expand Down Expand Up @@ -75,7 +66,7 @@ module.exports = function (grunt) {
},
dist: {
options: {
extends: '../../js/.babelrc'
extends: '../../.babelrc'
},
files: {
'<%= concat.bootstrap.dest %>' : '<%= concat.bootstrap.dest %>'
Expand Down
2 changes: 1 addition & 1 deletion docs/.htmllintrc
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
7 changes: 4 additions & 3 deletions docs/_includes/footer.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
10 changes: 0 additions & 10 deletions docs/_plugins/bridge.rb

This file was deleted.

10 changes: 0 additions & 10 deletions grunt/configBridge.json

This file was deleted.

3 changes: 1 addition & 2 deletions grunt/upload-preview.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit cab6f7d

Please sign in to comment.