diff --git a/.gitignore b/.gitignore index 0d74d48fe6..5c7f051926 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,9 @@ nbproject *.komodoproject .komodotools +# grunt-html-validation +validation-staus.json + # Folders to ignore .hg .svn diff --git a/.travis.yml b/.travis.yml index 5ed6e43e67..9f2371887f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: node_js node_js: - 0.8 before_script: + - gem install jekyll - npm install -g grunt-cli env: global: diff --git a/Gruntfile.js b/Gruntfile.js index c15b4ad115..576c637413 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -102,6 +102,19 @@ module.exports = function(grunt) { } }, + jekyll: { + docs: {} + }, + + validation: { + options: { + reset: true, + }, + files: { + src: ["_gh_pages/**/*.html"] + } + }, + watch: { src: { files: '<%= jshint.src.src %>', @@ -127,12 +140,17 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-contrib-qunit'); grunt.loadNpmTasks('grunt-contrib-uglify'); grunt.loadNpmTasks('grunt-contrib-watch'); + grunt.loadNpmTasks('grunt-html-validation'); + grunt.loadNpmTasks('grunt-jekyll'); grunt.loadNpmTasks('grunt-recess'); grunt.loadNpmTasks('browserstack-runner'); + // Docs HTML validation task + grunt.registerTask('validate-docs', ['jekyll', 'validation']); + // Test task. - var testSubtasks = ['jshint', 'qunit']; + var testSubtasks = ['jshint', 'qunit', 'validate-docs']; // 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 diff --git a/_config.yml b/_config.yml index 6dc300d668..6b6c87acc1 100644 --- a/_config.yml +++ b/_config.yml @@ -13,7 +13,7 @@ port: 9001 # Custom vars repo: https://github.com/twbs/bootstrap download: https://github.com/twbs/bootstrap/archive/3.0.0-wip.zip -download_dist: http://getbootstrap.com/bs-v3.0.0-rc1-dist.zip +download_dist: http://getbootstrap.com/bs-v3.0.0-rc.2-dist.zip examples: http://examples.getbootstrap.com examples_repo: https://github.com/twbs/bootstrap-examples @@ -24,5 +24,5 @@ glyphicons_repo: https://github.com/twbs/bootstrap-glyphicons blog: http://blog.getbootstrap.com expo: http://expo.getbootstrap.com -cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/css/bootstrap.min.css -cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/js/bootstrap.min.js +cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.0-wip/css/bootstrap.min.css +cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.0-wip/js/bootstrap.min.js diff --git a/assets/css/docs.css b/assets/css/docs.css index de9cf18730..964248233f 100644 --- a/assets/css/docs.css +++ b/assets/css/docs.css @@ -719,7 +719,7 @@ body { -------------------------------------------------- */ /* Pseudo :focus state for showing how it looks in the docs */ -input.focused { +#focusedInput { border-color: rgba(82,168,236,.8); outline: 0; outline: thin dotted \9; /* IE6-9 */ diff --git a/bower.json b/bower.json index 7a3e4b622a..a7f3f769a0 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "version": "3.0.0", - "main": ["./dist/js/bootstrap.min.js", "./dist/js/bootstrap.js", "./dist/css/bootstrap.min.css", "./dist/css/bootstrap.css"], + "main": ["./dist/js/bootstrap.min.js", "./dist/css/bootstrap.min.css"], "ignore": [ "**/.*" ], diff --git a/components.html b/components.html index 222430b80d..bbfb2c86fc 100644 --- a/components.html +++ b/components.html @@ -19,24 +19,25 @@ base_url: "../"

Wrap the dropdown's trigger and the dropdown menu within .dropdown, or another element that declares position: relative;. Then add the menu's HTML.

-
{% highlight html %}
-
{% endhighlight %} @@ -53,23 +54,24 @@ base_url: "../"

Add a header to label sections of actions in any dropdown menu.

-
{% highlight html %} -