From 933b38421cc3ec1809c20a565dc1927f205c4d60 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 8 Jul 2014 03:51:32 -0700 Subject: [PATCH 01/13] derp --- docs/_includes/css/images.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_includes/css/images.html b/docs/_includes/css/images.html index 78f4c65b83..4f3687ea64 100644 --- a/docs/_includes/css/images.html +++ b/docs/_includes/css/images.html @@ -5,7 +5,7 @@

Images in Bootstrap 3 can be made responsive-friendly via the addition of the .img-responsive class. This applies max-width: 100%; and height: auto; to the image so that it scales nicely to the parent element.

SVG images and IE 8-10

-

In Internet Explorer IE 8-10, SVG images with .img-responsive are disproportionately sized. To fix this, add width: 100% \9; where necessary. Bootstrap doesn't apply this automatically as it causes complications to other image formats.

+

In Internet Explorer 8-10, SVG images with .img-responsive are disproportionately sized. To fix this, add width: 100% \9; where necessary. Bootstrap doesn't apply this automatically as it causes complications to other image formats.

{% highlight html %} Responsive image From 7f359666c47946d9ea84d9387a7c88cbcbc9aa4f Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Tue, 8 Jul 2014 13:33:21 +0200 Subject: [PATCH 02/13] Fix that @mdo nightlife <3 --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 58886f2dc8..9f114383c3 100644 --- a/README.md +++ b/README.md @@ -69,8 +69,8 @@ Bootstrap's documentation, included in this repo in the root directory, is built 1. If necessary, [install Jekyll](http://jekyllrb.com/docs/installation) (requires v2.1.x). - **Windows users:** Read [this unofficial guide](https://github.com/juthilo/run-jekyll-on-windows/) to get Jekyll up and running without problems. 2. Install the Ruby-based syntax highlighter, [Rouge](https://github.com/jneen/rouge), with `gem install rouge`. -2. From the root `/bootstrap` directory, run `jekyll serve` in the command line. -3. Open in your browser, and voilà. +3. From the root `/bootstrap` directory, run `jekyll serve` in the command line. +4. Open in your browser, and voilà. Learn more about using Jekyll by reading its [documentation](http://jekyllrb.com/docs/home/). From aa9182cab4bd84a6f8b7883850a825d4f4918bf9 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 8 Jul 2014 10:46:10 -0700 Subject: [PATCH 03/13] properly integrate Rouge into the Travis build; fixes #14078 [skip sauce] --- .travis.yml | 3 ++- test-infra/S3Cachefile.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 546e4917be..e47e3743b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ before_install: - time travis_retry sudo pip install -r test-infra/requirements.txt - rvm use 1.9.3 --fuzzy - export GEMDIR=$(rvm gemdir) - - if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $GEMDIR) jekyll=$JEKYLL_VERSION" > pseudo_Gemfile.lock; fi + - if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $GEMDIR) jekyll=$JEKYLL_VERSION rouge=$ROUGE_VERSION" > pseudo_Gemfile.lock; fi - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\"" - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip validator\]'; export TWBS_DO_VALIDATOR=$?; true - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?; true @@ -19,6 +19,7 @@ after_script: env: global: - JEKYLL_VERSION: 2.1.0 + - ROUGE_VERSION: 1.4.0 - SAUCE_USERNAME: bootstrap - secure: "pJkBwnuae9dKU5tEcCqccfS1QQw7/meEcfz63fM7ba7QJNjoA6BaXj08L5Z3Vb5vBmVPwBawxo5Hp0jC0r/Z/O0hGnAmz/Cz09L+cy7dSAZ9x4hvZePSja/UAusaB5ogMoO8l2b773MzgQeSmrLbExr9BWLeqEfjC2hFgdgHLaQ=" - secure: "gqjqISbxBJK6byFbsmr1AyP1qoWH+rap06A2gI7v72+Tn2PU2nYkIMUkCvhZw6K889jv+LhQ/ybcBxDOXHpNCExCnSgB4dcnmYp+9oeNZb37jSP0rQ+Ib4OTLjzc3/FawE/fUq5kukZTC7porzc/k0qJNLAZRx3YLALmK1GIdUY=" diff --git a/test-infra/S3Cachefile.json b/test-infra/S3Cachefile.json index 5335b2866d..e213ea4224 100644 --- a/test-infra/S3Cachefile.json +++ b/test-infra/S3Cachefile.json @@ -7,6 +7,6 @@ "rubygems": { "key": "../pseudo_Gemfile.lock", "cache": "$GEMDIR", - "generate": "gem install -N jekyll -v $JEKYLL_VERSION" + "generate": "gem install -N jekyll -v $JEKYLL_VERSION && gem install -N rouge -v $ROUGE_VERSION" } } From 5c1f4e1a0c7cd2f6adeedf2c2bd91ad87f32706d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 8 Jul 2014 11:58:33 -0700 Subject: [PATCH 04/13] add role="presentation" to tab
  • s to improve accessibility Refs #13554. Per https://github.com/paypal/bootstrap-accessibility-plugin/blob/master/README.md#tab-panel Credit: https://github.com/paypal/bootstrap-accessibility-plugin [skip sauce] --- docs/_includes/components/badges.html | 14 ++--- docs/_includes/components/navs.html | 66 +++++++++++------------ docs/_includes/js/dropdowns.html | 8 +-- docs/_includes/js/tabs.html | 22 ++++---- docs/examples/jumbotron-narrow/index.html | 6 +-- docs/examples/theme/index.html | 18 +++---- 6 files changed, 67 insertions(+), 67 deletions(-) diff --git a/docs/_includes/components/badges.html b/docs/_includes/components/badges.html index 95aea2e407..7c67ba769f 100644 --- a/docs/_includes/components/badges.html +++ b/docs/_includes/components/badges.html @@ -22,20 +22,20 @@

    Built-in styles are included for placing badges in active states in pill navigations.


    {% highlight html %}
      -
    • +