From 84c33a822da54a48f0f4751fe519dfc6b324a453 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 3 Jan 2014 16:19:20 -0800 Subject: [PATCH 01/11] Replace lingering page.url instance with site.baseurl Refs #12083 & #12037 --- docs/css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/css.html b/docs/css.html index 91cd0218c3..38f03c4a54 100644 --- a/docs/css.html +++ b/docs/css.html @@ -3462,7 +3462,7 @@ Bootstrap.javascripts_path @import "bootstrap/theme"; {% endhighlight %} -

The full list of Bootstrap variables can be found in the Customizer. You can override these by simply redefining the variable before the @import directive, e.g.:

+

The full list of Bootstrap variables can be found in the Customizer. You can override these by simply redefining the variable before the @import directive, e.g.:

{% highlight sass %} $navbar-default-bg: #312312; From 8662323cd5f35d329ad315a04b08cd841c2b925f Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Sat, 4 Jan 2014 10:46:05 -0500 Subject: [PATCH 02/11] Quote Node 0.10 so correct version is printed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index be63538028..5eccbe3a5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - 0.10 + - "0.10" before_install: - time sudo pip install --use-mirrors -r test-infra/requirements.txt - rvm use 1.9.3 --fuzzy From 11f56bbb7b472f7fd17bd86909cf480ee860c751 Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Sat, 4 Jan 2014 09:10:02 -0800 Subject: [PATCH 03/11] Use relative URLs --- docs/components.html | 4 ++-- docs/css.html | 8 ++++---- docs/javascript.html | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/components.html b/docs/components.html index 5cb0bfc203..be6ccc269e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1421,7 +1421,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,

Mobile device caveats

-

There are some caveats regarding using form controls within fixed elements on mobile devices. See our browser support docs for details.

+

There are some caveats regarding using form controls within fixed elements on mobile devices. See our browser support docs for details.

@@ -1454,7 +1454,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,

Context-specific usage

-

Like the standard button classes, .navbar-btn can be used on <a> and <input> elements. However, neither .navbar-btn nor the standard button classes should be used on <a> elements within .navbar-nav.

+

Like the standard button classes, .navbar-btn can be used on <a> and <input> elements. However, neither .navbar-btn nor the standard button classes should be used on <a> elements within .navbar-nav.

Text

diff --git a/docs/css.html b/docs/css.html index 38f03c4a54..1c8b7c1fd4 100644 --- a/docs/css.html +++ b/docs/css.html @@ -2552,7 +2552,7 @@ For example, <section> should be wrapped as inline.

Screen reader content

-

Hide an element to all devices except screen readers with .sr-only. Necessary for following accessibility best practices. Can also be used as a mixin.

+

Hide an element to all devices except screen readers with .sr-only. Necessary for following accessibility best practices. Can also be used as a mixin.

{% highlight html %} Skip to main content {% endhighlight %} @@ -2820,11 +2820,11 @@ For example, <section> should be wrapped as inline.

Bootstrap's CSS is built on Less, a preprocessor with additional functionality like variables, mixins, and functions for compiling CSS. Those looking to use the source Less files instead of our compiled CSS files can make use of the numerous variables and mixins we use throughout the framework.

-

Grid variables and mixins are covered within the Grid system section.

+

Grid variables and mixins are covered within the Grid system section.

Variables

-

Variables are used throughout the entire project as a way to centralize and share commonly used values like colors, spacing, or font stacks. For a complete breakdown, please see the Customizer.

+

Variables are used throughout the entire project as a way to centralize and share commonly used values like colors, spacing, or font stacks. For a complete breakdown, please see the Customizer.

Colors

Easily make use of two color schemes: grayscale and semantic. Grayscale colors provide quick access to commonly used shades of black while semantic include various colors assigned to meaningful contextual values.

@@ -3462,7 +3462,7 @@ Bootstrap.javascripts_path @import "bootstrap/theme"; {% endhighlight %} -

The full list of Bootstrap variables can be found in the Customizer. You can override these by simply redefining the variable before the @import directive, e.g.:

+

The full list of Bootstrap variables can be found in the Customizer. You can override these by simply redefining the variable before the @import directive, e.g.:

{% highlight sass %} $navbar-default-bg: #312312; diff --git a/docs/javascript.html b/docs/javascript.html index 3bceb67512..07d92aa320 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -109,7 +109,7 @@ $('#myModal').on('show.bs.modal', function (e) {

Mobile device caveats

-

There are some caveats regarding using modals on mobile devices. See our browser support docs for details.

+

There are some caveats regarding using modals on mobile devices. See our browser support docs for details.

Static example

@@ -795,7 +795,7 @@ $('#myTab li:eq(2) a').tab('show') // Select third tab (0-indexed) {% endhighlight %}

Markup

-

You can activate a tab or pill navigation without writing any JavaScript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the Bootstrap tab styling, while adding the nav and nav-pills classes will apply pill styling.

+

You can activate a tab or pill navigation without writing any JavaScript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the Bootstrap tab styling, while adding the nav and nav-pills classes will apply pill styling.

{% highlight html %}
    From a617c805f298b8feefd7703c12decd035ef7d1ec Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Sat, 4 Jan 2014 09:28:56 -0800 Subject: [PATCH 04/11] Fix anchor links --- docs/components.html | 4 ++-- docs/css.html | 2 +- docs/getting-started.html | 4 ++-- docs/javascript.html | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/components.html b/docs/components.html index be6ccc269e..f838481702 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1421,7 +1421,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,

    Mobile device caveats

    -

    There are some caveats regarding using form controls within fixed elements on mobile devices. See our browser support docs for details.

    +

    There are some caveats regarding using form controls within fixed elements on mobile devices. See our browser support docs for details.

    @@ -1454,7 +1454,7 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,

    Context-specific usage

    -

    Like the standard button classes, .navbar-btn can be used on <a> and <input> elements. However, neither .navbar-btn nor the standard button classes should be used on <a> elements within .navbar-nav.

    +

    Like the standard button classes, .navbar-btn can be used on <a> and <input> elements. However, neither .navbar-btn nor the standard button classes should be used on <a> elements within .navbar-nav.

    Text

    diff --git a/docs/css.html b/docs/css.html index 1c8b7c1fd4..8eeb23d58e 100644 --- a/docs/css.html +++ b/docs/css.html @@ -2552,7 +2552,7 @@ For example, <section> should be wrapped as inline.

    Screen reader content

    -

    Hide an element to all devices except screen readers with .sr-only. Necessary for following accessibility best practices. Can also be used as a mixin.

    +

    Hide an element to all devices except screen readers with .sr-only. Necessary for following accessibility best practices. Can also be used as a mixin.

    {% highlight html %} Skip to main content {% endhighlight %} diff --git a/docs/getting-started.html b/docs/getting-started.html index a09b78f6aa..b65e2ecf00 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -115,7 +115,7 @@ bootstrap/

    Basic template

    -

    Start with this basic HTML template, or modify these examples. We hope you'll customize our templates and examples, adapting them to suit your needs.

    +

    Start with this basic HTML template, or modify these examples. We hope you'll customize our templates and examples, adapting them to suit your needs.

    Copy the HTML below to begin working with a minimal Bootstrap document.

    {% highlight html %} @@ -289,7 +289,7 @@ bootstrap/

    Non-responsive Bootstrap

    -

    Easily disable the responsiveness of Bootstrap per our docs.

    +

    Easily disable the responsiveness of Bootstrap per our docs.

    diff --git a/docs/javascript.html b/docs/javascript.html index 07d92aa320..4fe058e095 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -109,7 +109,7 @@ $('#myModal').on('show.bs.modal', function (e) {

    Mobile device caveats

    -

    There are some caveats regarding using modals on mobile devices. See our browser support docs for details.

    +

    There are some caveats regarding using modals on mobile devices. See our browser support docs for details.

    Static example

    @@ -795,7 +795,7 @@ $('#myTab li:eq(2) a').tab('show') // Select third tab (0-indexed) {% endhighlight %}

    Markup

    -

    You can activate a tab or pill navigation without writing any JavaScript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the Bootstrap tab styling, while adding the nav and nav-pills classes will apply pill styling.

    +

    You can activate a tab or pill navigation without writing any JavaScript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the Bootstrap tab styling, while adding the nav and nav-pills classes will apply pill styling.

    {% highlight html %}
      From 82ed81fddfbe3f72404cbf48d01f4279db52855c Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Sat, 4 Jan 2014 21:35:06 -0800 Subject: [PATCH 05/11] Fix typo --- docs/about.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/about.html b/docs/about.html index 91704469df..ef28c4743c 100644 --- a/docs/about.html +++ b/docs/about.html @@ -116,7 +116,7 @@ lead: "Learn about the history of Bootstrap, meet the core team, and check out t

      Translations

      -

      Community members have translated Bootstrap's documentation into various langauges. None are officially supported and may not always be up to date.

      +

      Community members have translated Bootstrap's documentation into various languages. None are officially supported and may not always be up to date.

      • Bootstrap 中文文档 (Chinese)
      • Bootstrap по-русски (Russian)
        • From 78eb8cc0f431cf20f128823202e9a6cf5a118c6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sun, 5 Jan 2014 11:38:26 +0100 Subject: [PATCH 06/11] Replace @screen-sm with @screen-sm-min --- less/forms.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/forms.less b/less/forms.less index aefa5a462c..34f970e2e2 100644 --- a/less/forms.less +++ b/less/forms.less @@ -325,7 +325,7 @@ input[type="checkbox"], .form-inline { // Kick in the inline - @media (min-width: @screen-sm) { + @media (min-width: @screen-sm-min) { // Inline-block all the things for "inline" .form-group { display: inline-block; From f63cd94e431602a3f4127bde684df219b106f7fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= Date: Sun, 5 Jan 2014 11:51:49 +0100 Subject: [PATCH 07/11] Reorganize vars --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index b6e18adbea..6415d3a2e3 100644 --- a/_config.yml +++ b/_config.yml @@ -16,6 +16,7 @@ url: http://localhost:9001 # Custom vars current_version: 3.0.3 repo: https://github.com/twbs/bootstrap +sass_repo: https://github.com/twbs/bootstrap-sass download: source: https://github.com/twbs/bootstrap/archive/v3.0.3.zip @@ -23,7 +24,6 @@ download: blog: http://blog.getbootstrap.com expo: http://expo.getbootstrap.com -sass_repo: https://github.com/twbs/bootstrap-sass cdn: css: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css From 3e92ab0149d9bb06d715aaec3ee6f2b327cfea11 Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Sun, 5 Jan 2014 08:38:32 -0800 Subject: [PATCH 08/11] Fix typos --- docs/getting-started.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/getting-started.html b/docs/getting-started.html index b65e2ecf00..a8b2aececb 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -1002,12 +1002,12 @@ if (isAndroid) {
      • Freely download and use Bootstrap, in whole or in part, for personal, private, company internal, or commercial purposes
      • Use Bootstrap in packages or distributions that you create
      • Modify the source code
        • -
      • Grant a sublicense to modify and distribute Bootstrap to third parties not included in the lincense
        • +
      • Grant a sublicense to modify and distribute Bootstrap to third parties not included in the license

      It forbids you to:

        -
      • Hold the authors and license owners liable for damanges as Bootstrap is provided without warranty
        • +
      • Hold the authors and license owners liable for damages as Bootstrap is provided without warranty
      • Hold the creators or copyright holders of Bootstrap liable
      • Redistribute any piece of Bootstrap without proper attribution
      • Use any marks owned by Twitter in any way that might state or imply that Twitter endorses your distribution
        • From a53cf55be2ed9fd823053c8320dc106272baf2a9 Mon Sep 17 00:00:00 2001 From: Gregory HOULLIER Date: Sun, 5 Jan 2014 20:15:48 +0100 Subject: [PATCH 09/11] Replace getElementsByTag by querySelector for IE10 Mobile plateform. --- docs/assets/js/application.js | 2 +- docs/getting-started.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/assets/js/application.js b/docs/assets/js/application.js index 78eed1ae98..39969f081f 100644 --- a/docs/assets/js/application.js +++ b/docs/assets/js/application.js @@ -24,7 +24,7 @@ '@-ms-viewport{width:auto!important}' ) ); - document.getElementsByTagName('head')[0]. + document.querySelector('head'). appendChild(msViewportStyle); } diff --git a/docs/getting-started.html b/docs/getting-started.html index a09b78f6aa..1085d45abf 100644 --- a/docs/getting-started.html +++ b/docs/getting-started.html @@ -852,7 +852,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) { "@-ms-viewport{width:auto!important}" ) ) - document.getElementsByTagName("head")[0].appendChild(msViewportStyle) + document.querySelector("head").appendChild(msViewportStyle) } {% endhighlight %}

        For more information and usage guidelines, read Windows Phone 8 and Device-Width.

        From ae255447f24ef3dc995ee7939e1c8704160f0055 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 5 Jan 2014 12:55:03 -0800 Subject: [PATCH 10/11] add .container(-fluid) to remaining navbar examples for consistency/accuracy follow-up to 93a4d6cc5ecdc1cbc09c4b8af2e587f4480b36cf --- docs/components.html | 340 +++++++++++++++++--------------- docs/examples/navbar/index.html | 68 +++---- docs/javascript.html | 140 ++++++------- 3 files changed, 284 insertions(+), 264 deletions(-) diff --git a/docs/components.html b/docs/components.html index f838481702..bb4464cb41 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1270,108 +1270,112 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,
        {% highlight html %} {% endhighlight %} @@ -1391,22 +1395,24 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,

        As a heads up, .navbar-form shares much of its code with .form-inline via mixin. Some form controls, like input groups, may require fixed widths to be show up properly within a navbar.

        @@ -1434,17 +1440,19 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,

        Add the .navbar-btn class to <button> elements not residing in a <form> to vertically center them in the navbar.

        @@ -1461,17 +1469,19 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,

        Wrap strings of text in an element with .navbar-text, usually on a <p> tag for proper leading and color.

        @@ -1484,17 +1494,19 @@ lead: "Over a dozen reusable components built to provide iconography, dropdowns,

        For folks using standard links that are not within the regular navbar navigation component, use the .navbar-link class to add the proper colors for the default and inverse navbar options.

        @@ -1637,25 +1649,27 @@ body { padding-bottom: 70px; }

        Modify the look of the navbar by adding .navbar-inverse.

        {% highlight html %} diff --git a/docs/examples/navbar/index.html b/docs/examples/navbar/index.html index 2ff133f7d6..3abc93ccae 100644 --- a/docs/examples/navbar/index.html +++ b/docs/examples/navbar/index.html @@ -32,39 +32,41 @@ diff --git a/docs/javascript.html b/docs/javascript.html index 4fe058e095..d7035d6612 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -431,51 +431,53 @@ $('#myModal').on('hidden.bs.modal', function (e) {

        Within a navbar

        @@ -606,29 +608,31 @@ $('#myDropdown').on('show.bs.dropdown', function () {

        The ScrollSpy plugin is for automatically updating nav targets based on scroll position. Scroll the area below the navbar and watch the active class change. The dropdown sub items will be highlighted as well.

        From 1d0bf580c99e9b03a4219c8aa4e313808bccbf10 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 5 Jan 2014 13:26:15 -0800 Subject: [PATCH 11/11] Use mix of medium and small grid clases on dashboard example --- docs/examples/dashboard/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/examples/dashboard/index.html b/docs/examples/dashboard/index.html index b85e41a130..d066448782 100644 --- a/docs/examples/dashboard/index.html +++ b/docs/examples/dashboard/index.html @@ -55,7 +55,7 @@
        -
        +
        -
        +

        Dashboard