From 461b05f5b1d75341fd8b98a216c69e2cc33418be Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 12 Aug 2013 12:09:52 -0700 Subject: [PATCH 01/24] update download_dist for RC 2 --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 6dc300d668..7d4c151894 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 From af2ea581b24bfae28a72275fac000a72e9e4130a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 12 Aug 2013 12:13:15 -0700 Subject: [PATCH 02/24] update CDN links to point to continuously-updated build; addresses #9138 & its many dupes --- _config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 7d4c151894..6b6c87acc1 100644 --- a/_config.yml +++ b/_config.yml @@ -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 From 38d6e7179a03c5830030d96e2ab3190760a60695 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 12 Aug 2013 12:32:32 -0700 Subject: [PATCH 03/24] don't show download_dist in favor of site.download; addresses #9138 & its many dupes --- getting-started.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/getting-started.html b/getting-started.html index f9245e5f84..c326734b27 100644 --- a/getting-started.html +++ b/getting-started.html @@ -15,9 +15,14 @@ base_url: "../"

There are a few easy ways to quickly get started with Bootstrap, each one appealing to a different skill level and use case. Read through to see what suits your particular needs.

+

Download latest full source

+

Until Bootstrap 3.0.0 is finalized, download the latest full source code (includes compiled and minified versions of our CSS and JavaScript under the dist/ directory).

+ Download latest Bootstrap 3 +

More download options

From bb5be0a2f9b9ed789e79603c106e8d2c7cf62305 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 12 Aug 2013 15:01:06 -0700 Subject: [PATCH 04/24] add HTML5 validation of docs pages to the build --- .gitignore | 3 +++ .travis.yml | 1 + Gruntfile.js | 20 +++++++++++++++++++- package.json | 2 ++ 4 files changed, 25 insertions(+), 1 deletion(-) 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/package.json b/package.json index 5f14283167..efcc5af0cc 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,8 @@ , "grunt-contrib-uglify": "~0.2.2" , "grunt-contrib-qunit": "~0.2.2" , "grunt-contrib-watch": "~0.5.1" + , "grunt-html-validation": "git://github.com/praveenvijayan/grunt-html-validation.git" + , "grunt-jekyll": "~0.3.8" , "grunt-recess": "~0.3.3" , "browserstack-runner": "~0.0.11" } From 3ec793072072773c2d834d99d7e4307629c18058 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 12 Aug 2013 18:09:25 -0700 Subject: [PATCH 05/24] add ARIA roles to Dropdown examples in Components docs --- components.html | 52 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/components.html b/components.html index 39039a4484..ceb745688f 100644 --- a/components.html +++ b/components.html @@ -20,11 +20,11 @@ base_url: "../" @@ -32,11 +32,11 @@ base_url: "../" {% endhighlight %} @@ -54,22 +54,22 @@ base_url: "../"
{% highlight html %} {% endhighlight %} @@ -79,17 +79,17 @@ base_url: "../" {% highlight html %} {% endhighlight %}
From b33989a97791560f064e723cfff2ec5b4ac65eba Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 12 Aug 2013 18:59:58 -0700 Subject: [PATCH 06/24] add src attribute to holder.js-powered s so that they validate use `data:` URL of empty invalid PNG: src="data:image/png;base64," --- components.html | 30 +++++++++++++++--------------- css.html | 6 +++--- javascript.html | 12 ++++++------ 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/components.html b/components.html index ceb745688f..d213030bbf 100644 --- a/components.html +++ b/components.html @@ -1819,22 +1819,22 @@ body { padding-bottom: 70px; } @@ -1856,7 +1856,7 @@ body { padding-bottom: 70px; }
- +

Thumbnail label

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

@@ -1866,7 +1866,7 @@ body { padding-bottom: 70px; }
- +

Thumbnail label

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

@@ -1876,7 +1876,7 @@ body { padding-bottom: 70px; }
- +

Thumbnail label

Cras justo odio, dapibus ac facilisis in, egestas eget quam. Donec id elit non mi porta gravida at eget metus. Nullam id dolor id nibh ultricies vehicula ut id elit.

@@ -2148,7 +2148,7 @@ body { padding-bottom: 70px; }
- Generic placeholder image + Generic placeholder image

Media heading

@@ -2157,14 +2157,14 @@ body { padding-bottom: 70px; }
- Generic placeholder image + Generic placeholder image

Media heading

Cras sit amet nibh libero, in gravida nulla. Nulla vel metus scelerisque ante sollicitudin commodo. Cras purus odio, vestibulum in vulputate at, tempus viverra turpis. Fusce condimentum nunc ac nisi vulputate fringilla. Donec lacinia congue felis in faucibus.
- Generic placeholder image + Generic placeholder image

Media heading

@@ -2192,7 +2192,7 @@ body { padding-bottom: 70px; }
  • - Generic placeholder image + Generic placeholder image

    Media heading

    @@ -2200,7 +2200,7 @@ body { padding-bottom: 70px; }
    - Generic placeholder image + Generic placeholder image

    Nested media heading

    @@ -2208,7 +2208,7 @@ body { padding-bottom: 70px; }
    - Generic placeholder image + Generic placeholder image

    Nested media heading

    @@ -2220,7 +2220,7 @@ body { padding-bottom: 70px; }
    - Generic placeholder image + Generic placeholder image

    Nested media heading

    @@ -2231,7 +2231,7 @@ body { padding-bottom: 70px; }
  • - Generic placeholder image + Generic placeholder image

    Media heading

    diff --git a/css.html b/css.html index 8b3cc0c50c..d4d4c03355 100644 --- a/css.html +++ b/css.html @@ -2012,9 +2012,9 @@ For example, <section> should be wrapped as inline.

    Keep in mind that Internet Explorer 8 lacks support for rounded corners.

    - A generic square placeholder image with rounded corners - A generic square placeholder image where only the portion within the circle circumscribed about said square is visible - A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera + A generic square placeholder image with rounded corners + A generic square placeholder image where only the portion within the circle circumscribed about said square is visible + A generic square placeholder image with a white border around it, making it resemble a photograph taken with an old instant camera
    {% highlight html %} ... diff --git a/javascript.html b/javascript.html index 49f49edf06..f15f5540d2 100644 --- a/javascript.html +++ b/javascript.html @@ -1613,13 +1613,13 @@ $('#myCollapsible').on('hidden.bs.collapse', function () { @@ -1675,21 +1675,21 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {