diff --git a/.travis.yml b/.travis.yml index 7ccf23744c..f36af0aa4f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,24 @@ language: node_js node_js: - 0.10 -before_script: - - gem install jekyll - - npm install -g grunt-cli +before_install: + - time sudo pip install --use-mirrors -r ./test-infra/requirements.txt +install: + - if [ "$TWBS_TEST" = validate-html ]; then time gem install jekyll; fi + - time npm install -g grunt-cli + - time ./test-infra/node_modules_cache.py download || time npm install +after_script: + - if [ "$TWBS_TEST" = core ]; then time ./test-infra/node_modules_cache.py upload; fi env: global: - - SAUCE_USERNAME: bootstrap - - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ=" + - SAUCE_USERNAME: bootstrap + - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ=" + - secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY=" + - secure: "Gghh/e3Gsbj1+4RR9Lh2aR/xJl35HWiHqlPIeSUqE9D7uDCVTAwNce/dGL3Ew7uJPfJ6Pgr70wD3zgu3stw0Zmzayax0hiDtGwcQCxVIER08wqGANK9C2Q7PYJkNTNtiTo6ehKWbdV4Z+/U+TEYyQfpQTDbAFYk/vVpsdjp0Lmc=" + - secure: "RTbRdx4G/2OTLfrZtP1VbRljxEmd6A1F3GqXboeQTldsnAlwpsES65es5CE3ub/rmixLApOY9ot7OPmNixFgC2Y8xOsV7lNCC62QVpmqQEDyGFFQKb3yO6/dmwQxdsCqGfzf9Np6Wh5V22QFvr50ZLKLd7Uhd9oXMDIk/z1MJ3o=" + matrix: + - TWBS_TEST=core + - TWBS_TEST=validate-html + - TWBS_TEST=sauce-js-unit +matrix: + fast_finish: true diff --git a/Gruntfile.js b/Gruntfile.js index 89e7f42f33..dc301fa272 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -238,13 +238,13 @@ module.exports = function (grunt) { // See https://saucelabs.com/docs/platforms/webdriver { browserName: 'safari', - version: '6', - platform: 'OS X 10.8' + version: '7', + platform: 'OS X 10.9' }, { browserName: 'chrome', - version: '28', - platform: 'OS X 10.6' + version: '31', + platform: 'OS X 10.9' }, /* FIXME: currently fails 1 tooltip test { @@ -331,9 +331,19 @@ module.exports = function (grunt) { grunt.registerTask('validate-html', ['jekyll', 'validation']); // Test task. - var testSubtasks = ['dist-css', 'jshint', 'jscs', 'qunit', 'validate-html']; + var testSubtasks = []; + // Skip core tests if running a different subset of the test suite + if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'core') { + testSubtasks = testSubtasks.concat(['dist-css', 'jshint', 'jscs', 'qunit']); + } + // Skip HTML validation if running a different subset of the test suite + if (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'validate-html') { + testSubtasks.push('validate-html'); + } // Only run Sauce Labs tests if there's a Sauce access key - if (typeof process.env.SAUCE_ACCESS_KEY !== 'undefined') { + if (typeof process.env.SAUCE_ACCESS_KEY !== 'undefined' + // Skip Sauce if running a different subset of the test suite + && (!process.env.TWBS_TEST || process.env.TWBS_TEST === 'sauce-js-unit')) { testSubtasks.push('connect'); testSubtasks.push('saucelabs-qunit'); } diff --git a/_includes/nav-css.html b/_includes/nav-css.html index 0228932dd3..531b067e66 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -87,6 +87,8 @@
  • Helper classes
  • +
  • + Using LESS + +
  • diff --git a/_includes/nav-javascript.html b/_includes/nav-javascript.html index e97027096c..aeeafe2641 100644 --- a/_includes/nav-javascript.html +++ b/_includes/nav-javascript.html @@ -13,6 +13,7 @@ Modal diff --git a/components.html b/components.html index 8377b81238..91495c38e9 100644 --- a/components.html +++ b/components.html @@ -902,9 +902,13 @@ base_url: "../" {% endhighlight %} -

    Add .pull-right to a .dropdown-menu to right align the dropdown menu.

    +

    Add .dropdown-menu-right to a .dropdown-menu to right align the dropdown menu.

    +
    +

    Deprecated .pull-right alignment

    +

    As of v3.1, we've deprecated .pull-right on dropdown menus. To right-align a menu, use .dropdown-menu-right. Right-aligned nav components in the navbar use a mixin version of this class to automatically align the menu. To override it, use .dropdown-menu-left.

    +
    {% highlight html %} -