diff --git a/.travis.yml b/.travis.yml index 2d6cd8f4f4..5ed6e43e67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,4 +2,9 @@ language: node_js node_js: - 0.8 before_script: - - npm install -g grunt-cli \ No newline at end of file + - npm install -g grunt-cli +env: + global: + - secure: Besg41eyU+2mfxrywQ4ydOShMdc34ImaO0S0ENP+aCOBuyNBIgP59wy5tBMmyai2/8eInYeVps4Td96mWInMMxzTe3Bar7eTLG5tWVKRSr/wc4NBPZ/ppoPAmCEsz9Y+VptRH9/FO8n7hsL9EFZ+xBKbG+C0SccGoyBDpA5j7/w= + - secure: Ptiv7phCImFP3ALIz+sMQzrZg8k7C1gLZbFBhWxjnQr3g06wIfX3Ls5y9OHvxid+lOZZjISui3wzBVgpVHqwHUYf96+r0mo6/mJ+F4ffUmShZANVaIMD/JRTnXhUQJbvntGLvxn1EYWPdNM+2IHJrMipnjHxU9tkgAnlel4Zdew= + - TWBS_HAVE_OWN_BROWSERSTACK_KEY: "" diff --git a/Gruntfile.js b/Gruntfile.js index 3bf6cdc64c..c15b4ad115 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -128,10 +128,19 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-watch'); grunt.loadNpmTasks('grunt-recess'); + grunt.loadNpmTasks('browserstack-runner'); // Test task. - grunt.registerTask('test', ['jshint', 'qunit']); + var testSubtasks = ['jshint', 'qunit']; + // Only run BrowserStack tests under Travis + if (process.env.TRAVIS) { + // Only run BrowserStack tests if this is a mainline commit in twbs/bootstrap, or you have your own BrowserStack key + if ((process.env.TRAVIS_REPO_SLUG === 'twbs/bootstrap' && process.env.TRAVIS_PULL_REQUEST === 'false') || process.env.TWBS_HAVE_OWN_BROWSERSTACK_KEY) { + testSubtasks.push('browserstack_runner'); + } + } + grunt.registerTask('test', testSubtasks); // JS distribution task. grunt.registerTask('dist-js', ['concat', 'uglify']); diff --git a/README.md b/README.md index 68e14506d2..d6f5893c15 100644 --- a/README.md +++ b/README.md @@ -63,13 +63,13 @@ When completed, you'll be able to run the various Grunt commands provided from t ### Available Grunt commands #### Build - `grunt` -Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Requires recess and uglify-js.** +Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Requires [recess](https://github.com/twitter/recess) and [uglify-js](https://github.com/mishoo/UglifyJS).** #### Only compile CSS and JavaScript - `grunt dist` -`grunt dist` creates the `/dist` directory with compiled files. **Requires recess and uglify-js.** +`grunt dist` creates the `/dist` directory with compiled files. **Requires [recess](https://github.com/twitter/recess) and [uglify-js](https://github.com/mishoo/UglifyJS).** #### Tests - `grunt test` -Runs jshint and qunit tests headlessly in [phantomjs](http://code.google.com/p/phantomjs/) (used for ci). **Requires phantomjs.** +Runs jshint and qunit tests headlessly in [phantomjs](https://github.com/ariya/phantomjs/) (used for CI). **Requires [phantomjs](https://github.com/ariya/phantomjs/).** #### Watch - `grunt watch` This is a convenience method for watching just Less files and automatically building them whenever you save. diff --git a/_includes/nav-getting-started.html b/_includes/nav-getting-started.html index 022d335cd6..ad574b6211 100644 --- a/_includes/nav-getting-started.html +++ b/_includes/nav-getting-started.html @@ -14,9 +14,15 @@
  • Browser support
    • +
  • + Third party support +
    • +
  • + Accessibility +
  • License FAQs
  • Customizing Bootstrap -
    • \ No newline at end of file + diff --git a/_includes/nav-main.html b/_includes/nav-main.html index a9604f5884..6b5742cd1f 100644 --- a/_includes/nav-main.html +++ b/_includes/nav-main.html @@ -1,6 +1,7 @@ -
    +