diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a0745d797..af2a56b2d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,10 +28,6 @@ restrictions: Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) instead. We reserve the right to delete comments which violate this rule. -* Please **do not** open issues or pull requests regarding the code in - [`Normalize`](https://github.com/necolas/normalize.css) (open them in - its repository). - * Please **do not** open issues regarding the official themes offered on . Instead, please email any questions or feedback regarding those themes to `themes AT getbootstrap DOT com`. diff --git a/Gruntfile.js b/Gruntfile.js index 6b5bca0ef..428ef2d5b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -148,20 +148,6 @@ module.exports = function (grunt) { } }, - jekyll: { - options: { - bundleExec: true, - config: '_config.yml', - incremental: false - }, - docs: {}, - github: { - options: { - raw: 'github: true' - } - } - }, - watch: { src: { files: '<%= concat.bootstrap.src %>', @@ -209,6 +195,12 @@ module.exports = function (grunt) { htmllint: { command: 'npm run htmllint' }, + jekyll: { + command: 'npm run jekyll' + }, + 'jekyll-github': { + command: 'npm run jekyll-github' + }, sass: { command: 'npm run sass' }, @@ -271,7 +263,7 @@ module.exports = function (grunt) { require('time-grunt')(grunt) // Docs HTML validation task - grunt.registerTask('validate-html', ['jekyll:docs', 'exec:htmllint', 'exec:htmlhint']) + grunt.registerTask('validate-html', ['exec:jekyll', 'exec:htmllint', 'exec:htmlhint']) var runSubset = function (subset) { return !process.env.TWBS_TEST || process.env.TWBS_TEST === subset @@ -329,7 +321,7 @@ module.exports = function (grunt) { grunt.registerTask('lint-docs-css', ['exec:scss-lint-docs']) grunt.registerTask('docs-js', ['exec:uglify-docs']) grunt.registerTask('docs', ['lint-docs-css', 'docs-css', 'docs-js', 'clean:docs', 'copy:docs']) - grunt.registerTask('docs-github', ['jekyll:github']) + grunt.registerTask('docs-github', ['exec:jekyll-github']) grunt.registerTask('prep-release', ['dist', 'docs', 'docs-github', 'compress']) diff --git a/docs/content/tables.md b/docs/content/tables.md index 234c2ec88..040decfe0 100644 --- a/docs/content/tables.md +++ b/docs/content/tables.md @@ -560,17 +560,17 @@ Use contextual classes to color table rows or individual cells. ... ... +... ... ... -... ... ... + ... ... ... - ... {% endhighlight %} diff --git a/js/tests/index.html b/js/tests/index.html index 179ceb77e..81efd5876 100644 --- a/js/tests/index.html +++ b/js/tests/index.html @@ -2,67 +2,58 @@ + Bootstrap Plugin Test Suite - - + - + @@ -146,7 +108,7 @@ - + @@ -157,7 +119,6 @@ -
diff --git a/package.json b/package.json index 130c45cb4..f468ed858 100644 --- a/package.json +++ b/package.json @@ -23,6 +23,8 @@ "eslint": "eslint --ignore-path .eslintignore js && eslint --config js/tests/.eslintrc.json --env node grunt Gruntfile.js && eslint --config js/tests/.eslintrc.json docs/assets/js/src docs/assets/js/ie-emulation-modes-warning.js docs/assets/js/ie10-viewport-bug-workaround.js", "htmlhint": "htmlhint --config docs/.htmlhintrc _gh_pages/", "htmllint": "htmllint --rc docs/.htmllintrc _gh_pages/**/*.html js/tests/visual/*.html", + "jekyll": "bundle exec jekyll build", + "jekyll-github": "shx echo 'github: true' > $npm_config_tmp/twbsjekyll.yml && npm run jekyll -- --config _config.yml,$npm_config_tmp/twbsjekyll.yml && shx rm $npm_config_tmp/twbsjekyll.yml", "postcss": "postcss --config grunt/postcss.js --replace dist/css/*.css", "postcss-docs": "postcss --config grunt/postcss.js --no-map --replace docs/assets/css/docs.min.css && postcss --config grunt/postcss.js --no-map --replace docs/examples/**/*.css", "sass": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css", @@ -67,7 +69,6 @@ "grunt-contrib-qunit": "^1.2.0", "grunt-contrib-watch": "^1.0.0", "grunt-exec": "^1.0.1", - "grunt-jekyll": "^0.4.6", "grunt-saucelabs": "^9.0.0", "grunt-stamp": "^0.3.0", "htmlhint": "^0.9.13", diff --git a/scss/_custom-forms.scss b/scss/_custom-forms.scss index 2db4c7640..a73359c86 100644 --- a/scss/_custom-forms.scss +++ b/scss/_custom-forms.scss @@ -145,9 +145,7 @@ background-size: $custom-select-bg-size; border: $custom-select-border-width solid $custom-select-border-color; @include border-radius($custom-select-border-radius); - // Use vendor prefixes as `appearance` isn't part of the CSS spec. - -moz-appearance: none; - -webkit-appearance: none; + appearance: none; &:focus { border-color: $custom-select-focus-border-color;