From 5b9e2bf1265eb50c0d4105b2eb3da12280c37430 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 17 Jun 2014 12:57:54 -0700 Subject: popovers.html: fix typo: "Dimissmisable" --- docs/_includes/js/popovers.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index 2ee670741..53320fc4a 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -111,10 +111,10 @@ sagittis lacus vel augue laoreet rutrum faucibus.">

Dismiss on next click

Use the focus trigger to dismiss popovers on their next click.

- +
{% highlight html %} - + {% endhighlight %} {% highlight js %} $('.popover-dismiss').popover({ -- cgit v1.2.3 From 128e52ff29be0f275bb92693c9db3ba34d5c003d Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Tue, 17 Jun 2014 23:35:35 +0200 Subject: Fix dismissible spelling --- docs/_includes/components/alerts.html | 8 ++++---- docs/_includes/js/popovers.html | 4 ++-- docs/_includes/nav/components.html | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/components/alerts.html b/docs/_includes/components/alerts.html index f0895b0ed..749ecc2b4 100644 --- a/docs/_includes/components/alerts.html +++ b/docs/_includes/components/alerts.html @@ -32,16 +32,16 @@ {% endhighlight %} -

Dismissable alerts

-

Build on any alert by adding an optional .alert-dismissable and close button.

+

Dismissible alerts

+

Build on any alert by adding an optional .alert-dismissible and close button.

- {% highlight html %} -
-- cgit v1.2.3 From 74a264fb98ced0228d385d601e9edd913bb1b173 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 18:19:17 -0700 Subject: fixes #13021: add .form-group-sm/-lg --- docs/_includes/css/forms.html | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html index 95bb29c59..947c5179c 100644 --- a/docs/_includes/css/forms.html +++ b/docs/_includes/css/forms.html @@ -670,6 +670,42 @@ {% endhighlight %} +

Horizontal form group sizes

+

Quickly size labels and form controls within .form-horizontal by adding .form-group-lg or .form-group-sm.

+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+{% highlight html %} +
+
+ +
+ +
+
+
+ +
+ +
+
+
+{% endhighlight %} + +

Column sizing

Wrap inputs in grid columns, or any custom parent element, to easily enforce desired widths.

-- cgit v1.2.3 From 11cf54f9df61738d15078cf6eba25a9a26f584be Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 18:22:11 -0700 Subject: grunt --- docs/_includes/customizer-variables.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index 11f6e0385..075a0ea72 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -17,7 +17,7 @@
- +
-- cgit v1.2.3 From 02642350f807c1431e686f03a97c0067fc0a2b51 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 22:16:15 -0700 Subject: Fixes #13400, #13415: actually document the existing practice for links in panel headings --- docs/_includes/components/panels.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/_includes') diff --git a/docs/_includes/components/panels.html b/docs/_includes/components/panels.html index b00cd0f72..acf32c51c 100644 --- a/docs/_includes/components/panels.html +++ b/docs/_includes/components/panels.html @@ -22,6 +22,7 @@

Panel with heading

Easily add a heading container to your panel with .panel-heading. You may also include any <h1>-<h6> with a .panel-title class to add a pre-styled heading.

+

For proper link coloring, be sure to place links in headings within .panel-title.

Panel heading without title
-- cgit v1.2.3 From d222c21f842812088060be725d24213c7202c35f Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 22:24:56 -0700 Subject: grunt --- docs/_includes/customizer-variables.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index 075a0ea72..e318dd44d 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -1735,6 +1735,11 @@

Page header border color

+
+ + +

Width of horizontal description list titles

+

Miscellaneous

-- cgit v1.2.3 From 99f176e7ec678b4c9ea4fc973135d39a4553feab Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 18 Jun 2014 22:35:05 -0700 Subject: rewrite striped and active to deprecate the parent selectors, change the docs --- docs/_includes/components/progress-bars.html | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/components/progress-bars.html b/docs/_includes/components/progress-bars.html index a78e2c881..d57c3fa7d 100644 --- a/docs/_includes/components/progress-bars.html +++ b/docs/_includes/components/progress-bars.html @@ -120,60 +120,60 @@

Striped

Uses a gradient to create a striped effect. Not available in IE8.

-
-
+
+
40% Complete (success)
-
-
+
+
20% Complete
-
-
+
+
60% Complete (warning)
-
-
+
+
80% Complete (danger)
{% highlight html %} -
-
+
+
40% Complete (success)
-
-
+
+
20% Complete
-
-
+
+
60% Complete (warning)
-
-
+
+
80% Complete (danger)
{% endhighlight %}

Animated

-

Add .active to .progress-striped to animate the stripes right to left. Not available in IE9 and below.

+

Add .active to .progress-bar-striped to animate the stripes right to left. Not available in IE9 and below.

-
-
45% Complete
+
+
45% Complete
{% highlight html %} -
-
+
+
45% Complete
@@ -186,7 +186,7 @@
35% Complete (success)
-
+
20% Complete (warning)
@@ -199,7 +199,7 @@
35% Complete (success)
-
+
20% Complete (warning)
-- cgit v1.2.3 From bd541083f14f8293bc327255c17da4f376443d02 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Jun 2014 02:02:23 -0700 Subject: Nuke equal height columns example; got a few bugs that make it not ready for prime time in v3.2 --- docs/_includes/getting-started/examples.html | 7 ------- 1 file changed, 7 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/examples.html b/docs/_includes/getting-started/examples.html index 49729f53e..849d044c0 100644 --- a/docs/_includes/getting-started/examples.html +++ b/docs/_includes/getting-started/examples.html @@ -155,12 +155,5 @@

Offcanvas

Build a toggleable off-canvas navigation menu for use with Bootstrap.

-
- - - -

Equal-height grid columns

-

Adds automatic equal-height grid columns to Bootstrap's grid system.

-
-- cgit v1.2.3 From 91d2cf848bc6fcd07bf2b16ce0308b0372d28b2e Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Thu, 19 Jun 2014 14:56:43 +0200 Subject: Fix @gray-light in docs --- docs/_includes/css/less.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/less.html b/docs/_includes/css/less.html index eadbda775..a6fbbaa11 100644 --- a/docs/_includes/css/less.html +++ b/docs/_includes/css/less.html @@ -28,7 +28,7 @@ @gray-darker: lighten(#000, 13.5%); // #222 @gray-dark: lighten(#000, 20%); // #333 @gray: lighten(#000, 33.5%); // #555 -@gray-light: lighten(#000, 60%); // #999 +@gray-light: lighten(#000, 46.7%); // #777 @gray-lighter: lighten(#000, 93.5%); // #eee {% endhighlight %} -- cgit v1.2.3 From 8c1160d91bf0a7599a1b519592829dfb396fd847 Mon Sep 17 00:00:00 2001 From: Bas Bosman Date: Thu, 19 Jun 2014 11:26:55 +0200 Subject: Document IE8 font-face weirdness --- docs/_includes/getting-started/browser-device-support.html | 3 +++ docs/_includes/nav/getting-started.html | 1 + 2 files changed, 4 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html index 1a1236440..4140a9c22 100644 --- a/docs/_includes/getting-started/browser-device-support.html +++ b/docs/_includes/getting-started/browser-device-support.html @@ -106,6 +106,9 @@

Internet Explorer 8 and box-sizing

IE8 does not fully support box-sizing: border-box; when combined with min-width, max-width, min-height, or max-height. For that reason, as of v3.0.1, we no longer use max-width on .containers.

+

Internet Explorer 8 and @font-face

+

IE8 has some issues with @font-face when combined with :before. Bootstrap uses that combination with its Glyphicons. If a page is cached, and loaded without the mouse over the window (i.e. hit the refresh button or load something in an iframe) then the page gets rendered before the font loads. Hovering over the page (body) will show some of the icons and hovering over the remaining icons will show those as well. See issue #13863 for details.

+

IE Compatibility modes

Bootstrap is not supported in the old Internet Explorer compatibility modes. To be sure you're using the latest rendering mode for IE, consider including the appropriate <meta> tag in your pages:

{% highlight html %} diff --git a/docs/_includes/nav/getting-started.html b/docs/_includes/nav/getting-started.html index fae906920..54927c22a 100644 --- a/docs/_includes/nav/getting-started.html +++ b/docs/_includes/nav/getting-started.html @@ -44,6 +44,7 @@
  • Internet Explorer 8-9
  • IE8 and Respond.js
  • IE8 and box-sizing
    • +
  • IE8 and @font-face
  • IE Compatibility modes
  • IE10 and Windows (Phone) 8
  • Safari percent rounding
    • -- cgit v1.2.3 From 00cc166671a4ecfe3284662db14c8bf151de5bb5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Jun 2014 15:22:49 -0700 Subject: ids over names --- docs/_includes/css/forms.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/forms.html b/docs/_includes/css/forms.html index 947c5179c..2a1848e50 100644 --- a/docs/_includes/css/forms.html +++ b/docs/_includes/css/forms.html @@ -677,13 +677,13 @@
    - +
    - +
    @@ -693,13 +693,13 @@
    - +
    - +
    -- cgit v1.2.3 From 34248437c3bc7278f912c9005d3fd4877b723d83 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 19 Jun 2014 19:54:25 -0700 Subject: tweak alert per #13875 --- docs/_includes/js/buttons.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/buttons.html b/docs/_includes/js/buttons.html index 154320e48..ee5b3d71d 100644 --- a/docs/_includes/js/buttons.html +++ b/docs/_includes/js/buttons.html @@ -144,7 +144,7 @@ $('.btn').button()

    Cross-browser compatibility

    -

    Firefox persists the disabled state across page loads. A workaround for this is to use autocomplete="off".

    +

    Firefox persists form control states across page loads. A workaround for this is to use autocomplete="off".

    $().button('reset')

    -- cgit v1.2.3 From 7339759fd6e11473a633f55f53a0b4ced6a7fa7d Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Mon, 23 Jun 2014 17:51:02 +0200 Subject: Remove broken link to Customizing Bootstrap --- docs/_includes/getting-started/examples.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/examples.html b/docs/_includes/getting-started/examples.html index 849d044c0..b1739f1d7 100644 --- a/docs/_includes/getting-started/examples.html +++ b/docs/_includes/getting-started/examples.html @@ -1,7 +1,7 @@

    Examples

    -

    Build on the basic template above with Bootstrap's many components. See also Customizing Bootstrap for tips on maintaining your own Bootstrap variants.

    +

    Build on the basic template above with Bootstrap's many components. We encourage you to customize and adapt Bootstrap to suit your individual project's needs.

    Using the framework

    -- cgit v1.2.3 From d4ce4dbf122158e3d0d714ac8eead0144f071d05 Mon Sep 17 00:00:00 2001 From: Ilya Radchenko Date: Mon, 23 Jun 2014 12:25:14 -0400 Subject: fix typo in css - buttons --- docs/_includes/css/buttons.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/buttons.html b/docs/_includes/css/buttons.html index 15b0f5ed2..bfc5ded80 100644 --- a/docs/_includes/css/buttons.html +++ b/docs/_includes/css/buttons.html @@ -88,7 +88,7 @@

    Active state

    -

    Buttons will appear pressed (with a darker background, darker border, and inset shadow) when active. For <button> elements, this is done via :active. For <a> elements, it's done with .active. However, you may use .active on <button>s should you need to replicate the active state progammatically.

    +

    Buttons will appear pressed (with a darker background, darker border, and inset shadow) when active. For <button> elements, this is done via :active. For <a> elements, it's done with .active. However, you may use .active on <button>s should you need to replicate the active state programmatically.

    Button element

    No need to add :active as it's a pseudo-class, but if you need to force the same appearance, go ahead and add .active.

    -- cgit v1.2.3 From 32bde78e1996a92e6b801e1f4a475d5ab48685f8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 23 Jun 2014 10:41:45 -0700 Subject: grid class inconsistency /cc @juthilo --- docs/_includes/css/grid.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html index 8ff53dd71..f1ee7fcd1 100644 --- a/docs/_includes/css/grid.html +++ b/docs/_includes/css/grid.html @@ -353,10 +353,10 @@ Level 1: .col-md-9
    - Level 2: .col-xs-8 .col-md-6 + Level 2: .col-xs-8 .col-sm-6
    - Level 2: .col-xs-4 .col-md-6 + Level 2: .col-xs-4 .col-sm-6
    @@ -364,13 +364,13 @@ {% highlight html %}
    - Level 1: .col-md-9 + Level 1: .col-sm-9
    - Level 2: .col-xs-8 .col-md-6 + Level 2: .col-xs-8 .col-sm-6
    - Level 2: .col-xs-4 .col-md-6 + Level 2: .col-xs-4 .col-sm-6
    -- cgit v1.2.3 From 25b06d927fa8fb056b3b146db263498a34401fb8 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Mon, 23 Jun 2014 23:36:18 +0200 Subject: grid class inconsistency 2 https://github.com/twbs/bootstrap/commit/32bde78e1996a92e6b801e1f4a475d5ab48685f8 --- docs/_includes/css/grid.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html index f1ee7fcd1..429ef90f9 100644 --- a/docs/_includes/css/grid.html +++ b/docs/_includes/css/grid.html @@ -347,10 +347,10 @@

    Nesting columns

    -

    To nest your content with the default grid, add a new .row and set of .col-md-* columns within an existing .col-md-* column. Nested rows should include a set of columns that add up to 12 or less (it is not required that you use all 12 available columns).

    +

    To nest your content with the default grid, add a new .row and set of .col-sm-* columns within an existing .col-sm-* column. Nested rows should include a set of columns that add up to 12 or less (it is not required that you use all 12 available columns).

    - Level 1: .col-md-9 + Level 1: .col-sm-9
    Level 2: .col-xs-8 .col-sm-6 -- cgit v1.2.3