From 4d859d177a30b3d6c01e77343118f6c0246cd290 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 17 Mar 2014 03:04:37 -0700 Subject: copyedit responsive-embed.html --- docs/_includes/components/responsive-embed.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/responsive-embed.html b/docs/_includes/components/responsive-embed.html index bf65599d7..c9e0f5807 100644 --- a/docs/_includes/components/responsive-embed.html +++ b/docs/_includes/components/responsive-embed.html @@ -2,7 +2,7 @@

Responsive embed

Allow browsers to determine video or slideshow dimensions based on the width of their containing block by creating an intrinsic ratio that will properly scale on any device.

-

Rules are directly apply to <iframe>, <embed> and <object> elements, optionally use of an explicit descendant class .embed-responsive-item when you want to match the styling for other attributes.

+

Rules are directly applied to <iframe>, <embed>, and <object> elements; optionally use an explicit descendant class .embed-responsive-item when you want to match the styling for other attributes.

Pro-Tip! You don't need to include frameborder="0" in your <iframe>s as we override that for you.

-- cgit v1.2.3 From 11ffc7346b9a26735fe857e9b0794a5c609c1b7b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 31 Mar 2014 01:24:54 -0700 Subject: explicitly doc that icon classes should only be used on empty elements; closes #13240 --- docs/_includes/components/glyphicons.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html index 6900e0dfa..0f932f45c 100644 --- a/docs/_includes/components/glyphicons.html +++ b/docs/_includes/components/glyphicons.html @@ -21,6 +21,10 @@

Don't mix with other components

Icon classes cannot be directly combined with other components. They should not be used along with other classes on the same element. Instead, add a nested <span> and apply the icon classes to the <span>.

+
+

Only for use on empty elements

+

Icon classes should only be used on elements that contain no text content and have no child elements.

+
{% highlight html %} {% endhighlight %} -- cgit v1.2.3 From 1c19284a38ffc60c3a89bbda0f2f0355cf687417 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 28 Mar 2014 16:54:16 -0700 Subject: doc how to change the collapsed mobile navbar breakpoint; fixes #13126 --- docs/_includes/components/navbar.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/navbar.html b/docs/_includes/components/navbar.html index ab78e5853..8f85b73d1 100644 --- a/docs/_includes/components/navbar.html +++ b/docs/_includes/components/navbar.html @@ -17,6 +17,10 @@

Requires JavaScript

If JavaScript is disabled and the viewport is narrow enough that the navbar collapses, it will be impossible to expand the navbar and view the content within the .navbar-collapse.

+
+

Changing the collapsed mobile navbar breakpoint

+

The navbar collapses into its vertical mobile view when the viewport is narrower than @grid-float-breakpoint, and expands into its horizontal non-mobile view when the viewport is at least @grid-float-breakpoint in width. Adjust this variable in the Less source to control when the navbar collapses/expands. The default value is 768px (the smallest "small" or "tablet" screen).

+
+
+

Changing the icon font location

+

By default, Bootstrap assumes that the icon font files will be located in the ../fonts/ directory relative to your deployed CSS. For example, if your CSS file is at http://example.com/foobar/css/bootstrap.css, then your font files should be at http://example.com/foobar/fonts/glyphicons-halflings-regular.woff, etc.

+

If you are placing the icon font files elsewhere or changing their filenames, you will need to adjust the @icon-font-path and/or @icon-font-name Less variables accordingly.

+
{% highlight html %} {% endhighlight %} -- cgit v1.2.3 From 31f01c1abbe9a5c5aa3dc94da424ff99d60c45a7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 25 Apr 2014 12:02:16 -0700 Subject: Document that @import-ing Bootstrap can break the icon font path Addresses part of #13429. --- docs/_includes/components/glyphicons.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html index 18f202372..f93d0ec6a 100644 --- a/docs/_includes/components/glyphicons.html +++ b/docs/_includes/components/glyphicons.html @@ -30,6 +30,10 @@

By default, Bootstrap assumes that the icon font files will be located in the ../fonts/ directory relative to your deployed CSS. For example, if your CSS file is at http://example.com/foobar/css/bootstrap.css, then your font files should be at http://example.com/foobar/fonts/glyphicons-halflings-regular.woff, etc.

If you are placing the icon font files elsewhere or changing their filenames, you will need to adjust the @icon-font-path and/or @icon-font-name Less variables accordingly.

+
+

@importing Bootstrap via Less may require adjusting the icon font location

+

If you @import Bootstrap's Less source into your own Less file, you may need to adjust the @icon-font-path Less variable due to the way that relative paths in url(...)s work in Less.

+
{% highlight html %} {% endhighlight %} -- cgit v1.2.3 From 7026c9626aa16a9b9e225f49e9ca95fddd49f829 Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Tue, 29 Apr 2014 20:52:35 +0100 Subject: Remove sr-only from components/dropdowns example Assuming sr-only is used in the actual live code so that the menu can be shown open already ... but having sr-only in the highlighted example code itself is confusing/misleading. Also, change the text for the button from "Dropdown" to "Dropdown trigger" for clarity (and it then matches http://getbootstrap.com/javascript/#dropdowns) --- docs/_includes/components/dropdowns.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/dropdowns.html b/docs/_includes/components/dropdowns.html index 6e44c45ba..f4494b8a3 100644 --- a/docs/_includes/components/dropdowns.html +++ b/docs/_includes/components/dropdowns.html @@ -8,7 +8,7 @@
{% highlight html %}
-

@importing Bootstrap via Less may require adjusting the icon font location

-

If you @import Bootstrap's Less source into your own Less file, you may need to adjust the @icon-font-path Less variable due to the way that relative paths in url(...)s work in Less.

+

If you @import Bootstrap's Less source into your own Less file, you may need to adjust the @icon-font-path Less variable due to the way that the relative paths in our url(...)s work.

{% highlight html %} -- cgit v1.2.3 From 463e02511bcf584769052b6fc47c8d9af8901291 Mon Sep 17 00:00:00 2001 From: "Patrick H. Lauke" Date: Thu, 1 May 2014 20:26:42 +0100 Subject: Remove sr-only from components/dropdown entirely possibly less confusing option, as per discussion, is to always show the dropdown trigger button (both live and in that code example) --- docs/_includes/components/dropdowns.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/dropdowns.html b/docs/_includes/components/dropdowns.html index f4494b8a3..93da73250 100644 --- a/docs/_includes/components/dropdowns.html +++ b/docs/_includes/components/dropdowns.html @@ -7,8 +7,8 @@

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

-

Changing the icon font location

-

Bootstrap assumes icon font files will be located in the ../fonts/ directory. Moving or renaming those font files means updating the CSS in one of three ways:

+

Bootstrap assumes icon font files will be located in the ../fonts/ directory, relative to the compiled CSS files. Moving or renaming those font files means updating the CSS in one of three ways:

  • Change the @icon-font-path and/or @icon-font-name variables in the source Less files.
  • Utilize the relative URLs option provided by the Less compiler.
    • -- cgit v1.2.3 From 2535f7c79ad98bcb372636c9c6ff90841ffd1c37 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jun 2014 21:45:55 -0700 Subject: fixes #13769 --- docs/_includes/components/dropdowns.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/dropdowns.html b/docs/_includes/components/dropdowns.html index 93da73250..4889c64f2 100644 --- a/docs/_includes/components/dropdowns.html +++ b/docs/_includes/components/dropdowns.html @@ -7,7 +7,7 @@

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

    - @@ -22,7 +22,7 @@
    {% highlight html %}
    - @@ -56,7 +56,7 @@

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

    - @@ -85,7 +85,7 @@

    Add .disabled to a <li> in the dropdown to disable the link.

    - -- cgit v1.2.3 From ff7e8d5054b95951541cbc01ee58cb46b753f597 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 10 Jun 2014 18:09:30 -0700 Subject: button-groups.html: fix grammar: "in on" => "on" --- docs/_includes/components/button-groups.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/button-groups.html b/docs/_includes/components/button-groups.html index 16463ee33..018d66ed5 100644 --- a/docs/_includes/components/button-groups.html +++ b/docs/_includes/components/button-groups.html @@ -194,7 +194,7 @@

    IE8 and borders

    -

    Internet Explorer 8 doesn't render borders in on buttons in a justified button group, whether it's on <a> or <button> elements. To get around that, wrap each button in another .btn-group.

    +

    Internet Explorer 8 doesn't render borders on buttons in a justified button group, whether it's on <a> or <button> elements. To get around that, wrap each button in another .btn-group.

    See #12476 for more information.

    -- cgit v1.2.3 From e8100c3b3ced15114db8038a6dac7d9878f2c331 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jun 2014 21:14:04 -0700 Subject: fix thumbnails docs --- docs/_includes/components/thumbnails.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/thumbnails.html b/docs/_includes/components/thumbnails.html index ecc53882f..3b6dfce43 100644 --- a/docs/_includes/components/thumbnails.html +++ b/docs/_includes/components/thumbnails.html @@ -46,7 +46,7 @@
    - Generic placeholder thumbnail + Generic placeholder thumbnail

    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.

    @@ -56,7 +56,7 @@
    - Generic placeholder thumbnail + Generic placeholder thumbnail

    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.

    @@ -66,7 +66,7 @@
    - Generic placeholder thumbnail + Generic placeholder thumbnail

    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.

    @@ -80,7 +80,7 @@
    - ... + ...

    Thumbnail label

    ...

    -- cgit v1.2.3 From dacaf619d2410e69ad8d3252ea2d0e992e296a84 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 10 Jun 2014 22:39:27 -0700 Subject: docs callout for #13219 --- docs/_includes/components/labels.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/labels.html b/docs/_includes/components/labels.html index bc2d5f9a2..ce0c5b4f0 100644 --- a/docs/_includes/components/labels.html +++ b/docs/_includes/components/labels.html @@ -32,4 +32,9 @@ Warning Danger {% endhighlight %} + +
    +

    Have tons of labels?

    +

    Rendering problems can arise when you have dozens of inline labels within a narrow container, each containing it's own inline-block element (like an icon). The way around this is setting display: inline-block;. For context and an example, see #13219.

    +
    -- cgit v1.2.3 From cb85f2ad9b7d4e5ca57b9417afc83a60a2274a05 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 10 Jun 2014 23:08:30 -0700 Subject: fix grammar in new callout --- docs/_includes/components/labels.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes/components') diff --git a/docs/_includes/components/labels.html b/docs/_includes/components/labels.html index ce0c5b4f0..05cf2fe81 100644 --- a/docs/_includes/components/labels.html +++ b/docs/_includes/components/labels.html @@ -35,6 +35,6 @@

    Have tons of labels?

    -

    Rendering problems can arise when you have dozens of inline labels within a narrow container, each containing it's own inline-block element (like an icon). The way around this is setting display: inline-block;. For context and an example, see #13219.

    +

    Rendering problems can arise when you have dozens of inline labels within a narrow container, each containing its own inline-block element (like an icon). The way around this is setting display: inline-block;. For context and an example, see #13219.

    -- 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 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/_includes/components') 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 %} -