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') 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 eea9eabb83a54402f0219d799e2156525d3c7709 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 17 Mar 2014 03:12:03 -0700 Subject: fix raw source to match live example #12956 errata --- docs/_includes/css/type.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html index 9c5aee200..80e30cd42 100644 --- a/docs/_includes/css/type.html +++ b/docs/_includes/css/type.html @@ -112,7 +112,7 @@

You can use the mark tag to highlight text.

{% highlight html %} -This line of text is meant to be treated as deleted text. +You can use the mark tag to highlight text. {% endhighlight %} -- cgit v1.2.3 From 4df96c768f823106949ea07898b231ab8d40b109 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 17 Mar 2014 03:15:27 -0700 Subject: fix description of #12956 errata --- docs/_includes/css/type.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html index 80e30cd42..2ea046519 100644 --- a/docs/_includes/css/type.html +++ b/docs/_includes/css/type.html @@ -107,7 +107,7 @@

Inline text elements

Marked text

-

For indicating blocks of text that have been deleted use the <mark> tag.

+

For highlighting a run of text due to its relevance in another context, use the <mark> tag.

You can use the mark tag to highlight text.

-- cgit v1.2.3 From d52ad3ee3ba5a0fc51e1f06abeebd888846856eb Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Mon, 17 Mar 2014 15:58:03 +0100 Subject: Separate JS includes for alerts and popovers /cc @mdo --- docs/_includes/js/alerts.html | 71 ++++++++++++++++++++++++++++++++++++++ docs/_includes/js/popovers.html | 76 ----------------------------------------- 2 files changed, 71 insertions(+), 76 deletions(-) create mode 100644 docs/_includes/js/alerts.html (limited to 'docs/_includes') diff --git a/docs/_includes/js/alerts.html b/docs/_includes/js/alerts.html new file mode 100644 index 000000000..04bbd43cf --- /dev/null +++ b/docs/_includes/js/alerts.html @@ -0,0 +1,71 @@ +
+

Alert messages alert.js

+ +

Example alerts

+

Add dismiss functionality to all alert messages with this plugin.

+
+ +
+ +
+ +
+ + +

Usage

+

Enable dismissal of an alert via JavaScript:

+ {% highlight js %}$(".alert").alert(){% endhighlight %} + +

Markup

+

Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.

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

Methods

+ +

$().alert()

+

Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.

+ +

.alert('close')

+

Closes an alert.

+ {% highlight js %}$(".alert").alert('close'){% endhighlight %} + + +

Events

+

Bootstrap's alert class exposes a few events for hooking into alert functionality.

+
+ + + + + + + + + + + + + + + + + +
Event TypeDescription
close.bs.alertThis event fires immediately when the close instance method is called.
closed.bs.alertThis event is fired when the alert has been closed (will wait for CSS transitions to complete).
+
+{% highlight js %} +$('#my-alert').bind('closed.bs.alert', function () { + // do something… +}) +{% endhighlight %} +
diff --git a/docs/_includes/js/popovers.html b/docs/_includes/js/popovers.html index 7bf515ad4..56e3600aa 100644 --- a/docs/_includes/js/popovers.html +++ b/docs/_includes/js/popovers.html @@ -263,79 +263,3 @@ $('#myPopover').on('hidden.bs.popover', function () { }) {% endhighlight %}
- - - - -
-

Alert messages alert.js

- -

Example alerts

-

Add dismiss functionality to all alert messages with this plugin.

-
- -
- -
- -
- - -

Usage

-

Enable dismissal of an alert via JavaScript:

- {% highlight js %}$(".alert").alert(){% endhighlight %} - -

Markup

-

Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.

- {% highlight html %}{% endhighlight %} - -

Methods

- -

$().alert()

-

Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the .fade and .in class already applied to them.

- -

.alert('close')

-

Closes an alert.

- {% highlight js %}$(".alert").alert('close'){% endhighlight %} - - -

Events

-

Bootstrap's alert class exposes a few events for hooking into alert functionality.

-
- - - - - - - - - - - - - - - - - -
Event TypeDescription
close.bs.alertThis event fires immediately when the close instance method is called.
closed.bs.alertThis event is fired when the alert has been closed (will wait for CSS transitions to complete).
-
-{% highlight js %} -$('#my-alert').bind('closed.bs.alert', function () { - // do something… -}) -{% endhighlight %} -
-- cgit v1.2.3 From 1b15cefa5c5342129bec9b794946f3fb2641077d Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Mon, 17 Mar 2014 12:19:45 +0100 Subject: Generate Translations list from YAML --- docs/_includes/getting-started/translations.html | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/translations.html b/docs/_includes/getting-started/translations.html index dc46f5d90..215f790de 100644 --- a/docs/_includes/getting-started/translations.html +++ b/docs/_includes/getting-started/translations.html @@ -3,13 +3,9 @@

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

We don't help organize or host translations, we just link to them.

Finished a new or better translation? Open a pull request to add it to our list.

-- cgit v1.2.3 From 8534e12523c7156b53e76393cc8d016ffdcf5b4f Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Mon, 20 Jan 2014 11:54:22 -0800 Subject: Add tooltip `viewport` option, respect bounds of the viewport --- docs/_includes/js/tooltips.html | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index 2656556be..b952e8504 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -134,6 +134,14 @@ $('#example').tooltip(options)

Appends the tooltip to a specific element. Example: container: 'body'

+ + viewport + string | object + { selector: 'body', padding: 0 } + +

Keeps the tooltip within the bounds of this element. Example: viewport: '#viewport' or { selector: '#viewport', padding: 0 }

+ + -- cgit v1.2.3 From 4f9270cc20c29cd3fbb0664379d620d14bb24a91 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Mon, 24 Mar 2014 09:28:40 +0200 Subject: Switch to `icon` instead of `shortcut icon` to fix the HTML validation tests. --- docs/_includes/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/header.html b/docs/_includes/header.html index defb549ae..f11ed4baa 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -28,7 +28,7 @@ - + -- cgit v1.2.3 From 98bddd8904f2d745ad16d8bd591a0771577bf414 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 27 Mar 2014 12:47:59 -0700 Subject: Add TOC entry for "Third-party libraries" callout section to JS docs --- docs/_includes/nav/javascript.html | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/_includes') diff --git a/docs/_includes/nav/javascript.html b/docs/_includes/nav/javascript.html index 741b9cf81..9cccf1d99 100644 --- a/docs/_includes/nav/javascript.html +++ b/docs/_includes/nav/javascript.html @@ -6,6 +6,7 @@
  • Programmatic API
  • No conflict
  • Events
    • +
  • Third-party libraries
  • Transitions
    • -- cgit v1.2.3 From a696d47592ef19510087113fa8e88af31a6491e0 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Thu, 27 Mar 2014 21:26:21 +0100 Subject: Change GA events to Universal Analytics --- docs/_includes/getting-started/download.html | 6 +++--- docs/_includes/nav/main.html | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html index e3adffd8b..c89c8b9e4 100644 --- a/docs/_includes/getting-started/download.html +++ b/docs/_includes/getting-started/download.html @@ -8,21 +8,21 @@

    Bootstrap

    Compiled and minified CSS, JavaScript, and fonts. No docs or original source files are included.

    - Download Bootstrap + Download Bootstrap

    Source code

    Source Less, JavaScript, and font files, along with our docs. Requires a Less compiler and some setup.

    - Download source + Download source

    Sass

    Bootstrap ported from Less to Sass for easy inclusion in Rails, Compass, or Sass-only projects.

    - Download Sass + Download Sass

    diff --git a/docs/_includes/nav/main.html b/docs/_includes/nav/main.html index 9f449f258..6f773d2c1 100644 --- a/docs/_includes/nav/main.html +++ b/docs/_includes/nav/main.html @@ -28,8 +28,8 @@ -- cgit v1.2.3 From b57396944a39b21571848728b6ad479cd50537cd Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 27 Mar 2014 13:57:50 -0700 Subject: Add equal-height grid columns as an experimental example. Based on @pete-otaqui's work from #11851 --- docs/_includes/getting-started/examples.html | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/examples.html b/docs/_includes/getting-started/examples.html index e6aed9bee..bf87a2cec 100644 --- a/docs/_includes/getting-started/examples.html +++ b/docs/_includes/getting-started/examples.html @@ -155,5 +155,12 @@

    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 b2a67ffe55f5fedb0ae1d5dff331687c3e744be0 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Thu, 27 Mar 2014 22:59:26 +0100 Subject: Revert upgrade to Universal Analytics The Google Analytics account we use cannot currently be upgraded to Universal Analytics. In order to keep using Analytics, we have to stick with Classic for now. --- docs/_includes/getting-started/download.html | 6 +++--- docs/_includes/header.html | 14 ++++++++------ docs/_includes/nav/main.html | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html index c89c8b9e4..e3adffd8b 100644 --- a/docs/_includes/getting-started/download.html +++ b/docs/_includes/getting-started/download.html @@ -8,21 +8,21 @@

    Bootstrap

    Compiled and minified CSS, JavaScript, and fonts. No docs or original source files are included.

    - Download Bootstrap + Download Bootstrap

    Source code

    Source Less, JavaScript, and font files, along with our docs. Requires a Less compiler and some setup.

    - Download source + Download source

    Sass

    Bootstrap ported from Less to Sass for easy inclusion in Rails, Compass, or Sass-only projects.

    - Download Sass + Download Sass

    diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 212981ed6..f11ed4baa 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -31,10 +31,12 @@ diff --git a/docs/_includes/nav/main.html b/docs/_includes/nav/main.html index 6f773d2c1..9f449f258 100644 --- a/docs/_includes/nav/main.html +++ b/docs/_includes/nav/main.html @@ -28,8 +28,8 @@ -- cgit v1.2.3 From e59da022308c613deae3091723d5517bdaee9e43 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 31 Mar 2014 00:00:05 -0700 Subject: add document ready jQuery wrapper in Android Browser workaround --- docs/_includes/getting-started/browser-device-support.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (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 3e1dd3e66..183bb7668 100644 --- a/docs/_includes/getting-started/browser-device-support.html +++ b/docs/_includes/getting-started/browser-device-support.html @@ -176,11 +176,13 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {

    On <select> elements, the Android stock browser will not display the side controls if there is a border-radius and/or border applied. Use the snippet of code below to remove the offending CSS and render the <select> as an unstyled element on the Android stock browser. The user agent sniffing avoids interference with Chrome, Safari, and Mozilla browsers.

    {% highlight html %} {% endhighlight %}

    Want to see an example? Check out this JS Bin demo.

    -- 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') 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 640923eb36890eb194799beeb8ec3555e2b379cc Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 1 Apr 2014 13:03:14 -0700 Subject: help avoid misuse of Carousel's .active when copy-pasting from examples; fix #13252 --- docs/_includes/js/carousel.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html index 945910c75..b0665dba8 100644 --- a/docs/_includes/js/carousel.html +++ b/docs/_includes/js/carousel.html @@ -46,6 +46,12 @@ ... +
    + ... +
    + ... +
    +
    ... @@ -105,7 +111,7 @@ {% highlight html %} -
    +
    ...

    ...

    -- cgit v1.2.3 From 2d1d5754f781f0f3fa1bc296c9e69da416043c4a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 2 Apr 2014 19:55:05 -0700 Subject: document that you have to add .active yourself on prechecked btn-ized checkboxes+radios; fixes #12651 --- docs/_includes/js/buttons.html | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/buttons.html b/docs/_includes/js/buttons.html index 5af374228..154320e48 100644 --- a/docs/_includes/js/buttons.html +++ b/docs/_includes/js/buttons.html @@ -37,10 +37,14 @@

    Checkbox

    Add data-toggle="buttons" to a group of checkboxes for checkbox style toggling on btn-group.

    +
    +

    Pre-checked options need .active

    +

    For pre-checked options, you must add the .active class to the input's label yourself.

    +
    -
    {% highlight html %}
    -
    diff --git a/docs/_includes/header.html b/docs/_includes/header.html index f11ed4baa..37f7a7597 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -31,12 +31,12 @@ diff --git a/docs/_includes/nav/main.html b/docs/_includes/nav/main.html index 9f449f258..6f773d2c1 100644 --- a/docs/_includes/nav/main.html +++ b/docs/_includes/nav/main.html @@ -28,8 +28,8 @@
    -- cgit v1.2.3 From d56026d489fb8db66c2db6aa0d222f1a3fa9261f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 4 Apr 2014 10:25:22 -0700 Subject: fix grammar in "Underlined text" example --- docs/_includes/css/type.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html index 2ea046519..da81d7414 100644 --- a/docs/_includes/css/type.html +++ b/docs/_includes/css/type.html @@ -146,10 +146,10 @@ You can use the mark tag to highlight text.

    Underlined text

    To underline text use the <u> tag.

    -

    This line of text is will render as underlined

    +

    This line of text will render as underlined

    {% highlight html %} -This line of text is will render as underlined +This line of text will render as underlined {% endhighlight %}

    Make use of HTML's default emphasis tags with lightweight styles.

    -- cgit v1.2.3 From fce0254b2a90e99804e6433d01ca45a5378285ac Mon Sep 17 00:00:00 2001 From: Billy Matthews Date: Sat, 5 Apr 2014 18:33:57 -0400 Subject: Fixed typo in Responsive Tables CSS docs --- docs/_includes/css/tables.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/tables.html b/docs/_includes/css/tables.html index 99db2af72..affe17ffa 100644 --- a/docs/_includes/css/tables.html +++ b/docs/_includes/css/tables.html @@ -348,7 +348,7 @@

    Responsive tables

    -

    Create responsive tables by wrapping any .table in .table-responsive to make them scroll horizontally up to small devices (under 768px). When viewing on anything larger than 768px wide, you will not see any difference in these tables.

    +

    Create responsive tables by wrapping any .table in .table-responsive to make them scroll horizontally on small devices (under 768px). When viewing on anything larger than 768px wide, you will not see any difference in these tables.

    -- cgit v1.2.3 From f159ce8b9ee84f885222a48c856a0f64269ba079 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 7 Apr 2014 22:59:37 -0700 Subject: Fixes #13208: Drop for in code snippets and examples --- docs/_includes/components/navbar.html | 8 ++++---- docs/_includes/js/dropdowns.html | 12 ++++++------ docs/_includes/js/scrollspy.html | 2 +- docs/_includes/js/tabs.html | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/components/navbar.html b/docs/_includes/components/navbar.html index 8f85b73d1..02f4fbcfa 100644 --- a/docs/_includes/components/navbar.html +++ b/docs/_includes/components/navbar.html @@ -42,7 +42,7 @@
  • Link
  • Link
  • - Dropdown + Dropdown
    • -- cgit v1.2.3 From d42b1a2d2d0911de918bcd7ec37c7bd3568a18f3 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 25 Apr 2014 10:43:30 -0700 Subject: fix #13427 --- docs/_includes/css/less.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/less.html b/docs/_includes/css/less.html index b6d46da29..c07153318 100644 --- a/docs/_includes/css/less.html +++ b/docs/_includes/css/less.html @@ -76,7 +76,7 @@ {% highlight scss %} // Variables @link-color: @brand-primary; -@link-color-hover: darken(@link-color, 15%); +@link-hover-color: darken(@link-color, 15%); // Usage a { @@ -84,12 +84,12 @@ a { text-decoration: none; &:hover { - color: @link-color-hover; + color: @link-hover-color; text-decoration: underline; } } {% endhighlight %} -

    Note that the @link-color-hover uses a function, another awesome tool from Less, to automagically create the right hover color. You can use darken, lighten, saturate, and desaturate.

    +

    Note that the @link-hover-color uses a function, another awesome tool from Less, to automagically create the right hover color. You can use darken, lighten, saturate, and desaturate.

    Typography

    Easily set your type face, text size, leading, and more with a few quick variables. Bootstrap makes use of these as well to provide easy typographic mixins.

    -- 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') 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 43b6d6c2f879b08c682433adfd6a8a78622500b3 Mon Sep 17 00:00:00 2001 From: syed Date: Sat, 26 Apr 2014 09:44:14 +0500 Subject: fixes https://github.com/twbs/bootstrap/issues/13367 Second color stop value should be percentage instead of decimal value. --- docs/_includes/css/less.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/less.html b/docs/_includes/css/less.html index c07153318..eadbda775 100644 --- a/docs/_includes/css/less.html +++ b/docs/_includes/css/less.html @@ -378,10 +378,10 @@ a { {% highlight scss %} #gradient > .striped(#333; 45deg); {% endhighlight %} -

    Up the ante and use three colors instead. Set the first color, the second color, the second color's color stop (a decimal value like 0.25), and the third color with these mixins:

    +

    Up the ante and use three colors instead. Set the first color, the second color, the second color's color stop (a percentage value like 25%), and the third color with these mixins:

    {% highlight scss %} -#gradient > .vertical-three-colors(#777; #333; .25; #000); -#gradient > .horizontal-three-colors(#777; #333; .25; #000); +#gradient > .vertical-three-colors(#777; #333; 25%; #000); +#gradient > .horizontal-three-colors(#777; #333; 25%; #000); {% endhighlight %}

    Heads up! Should you ever need to remove a gradient, be sure to remove any IE-specific filter you may have added. You can do that by using the .reset-filter() mixin alongside background-image: none;.

    -- cgit v1.2.3 From a84a3693b12f549e075424a63d34a83dc19d277b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 24 Apr 2014 15:35:05 -0700 Subject: add ie-emulation-modes-warning.js to docs & examples --- docs/_includes/header.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 4eee52a3c..e12545ecc 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -20,7 +20,8 @@ - + + {% highlight html %}
    -

    Look to the examples for applying these principles to your code.

    @@ -252,6 +253,23 @@
    .col-xs-6 .col-sm-4
    +{% endhighlight %} + +

    Example: Column wrapping

    +

    If more than 12 columns are placed within a single row, each group of extra columns will, as one unit, wrap onto a new line.

    +
    +
    +
    .col-xs-9
    +
    .col-xs-4
    Since 9 + 4 = 13 > 12, this 4-column-wide div gets wrapped onto a new line as one contiguous unit.
    +
    .col-xs-6
    Subsequent columns continue along the new line.
    +
    +
    +{% highlight html %} +
    +
    .col-xs-9
    +
    .col-xs-4
    Since 9 + 4 = 13 > 12, this 4-column-wide div gets wrapped onto a new line as one contiguous unit.
    +
    .col-xs-6
    Subsequent columns continue along the new line.
    +
    {% endhighlight %}

    Responsive column resets

    diff --git a/docs/_includes/nav/css.html b/docs/_includes/nav/css.html index d67ad20be..f2b1b5420 100644 --- a/docs/_includes/nav/css.html +++ b/docs/_includes/nav/css.html @@ -18,6 +18,7 @@
  • Ex: Fluid container
  • Ex: Mobile and desktops
  • Ex: Mobile, tablet, desktops
    • +
  • Ex: Column wrapping
  • Responsive column resets
  • Offsetting columns
  • Nesting columns
    • -- cgit v1.2.3 From 42c8daea75b19424e026c78262e0fac1a95d715a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 1 May 2014 11:45:48 -0700 Subject: Not Less' fault per se --- docs/_includes/components/glyphicons.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/components/glyphicons.html b/docs/_includes/components/glyphicons.html index f93d0ec6a..301a542b6 100644 --- a/docs/_includes/components/glyphicons.html +++ b/docs/_includes/components/glyphicons.html @@ -32,7 +32,7 @@

    @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') 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.

    -
    - + -- cgit v1.2.3 From d6104b11511a69fb48d1e438141f135a14c04122 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 4 May 2014 02:09:03 -0700 Subject: include RTL CSS CDN URL in Download docs --- docs/_includes/getting-started/download.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html index c89c8b9e4..b457d038e 100644 --- a/docs/_includes/getting-started/download.html +++ b/docs/_includes/getting-started/download.html @@ -33,6 +33,9 @@ + + + -- cgit v1.2.3 From 04028cf6feb62471a3788cd15804e62b9ce890d7 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 4 May 2014 02:20:07 -0700 Subject: add RTL CSS files to "What's included" section of docs --- docs/_includes/getting-started/whats-included.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/whats-included.html b/docs/_includes/getting-started/whats-included.html index 8500e573c..278ebac60 100644 --- a/docs/_includes/getting-started/whats-included.html +++ b/docs/_includes/getting-started/whats-included.html @@ -17,6 +17,8 @@ bootstrap/ ├── css/ │ ├── bootstrap.css │ ├── bootstrap.min.css +│ ├── bootstrap-rtl.css +│ ├── bootstrap-rtl.min.css │ ├── bootstrap-theme.css │ └── bootstrap-theme.min.css ├── js/ -- cgit v1.2.3 From f71f2dbeb0ebafe0d8255317001396ce9ddb7e55 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 4 May 2014 02:24:04 -0700 Subject: emphasize that bootstrap-rtl.css & bootstrap.css should not be used together --- docs/_includes/css/rtl.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/rtl.html b/docs/_includes/css/rtl.html index 050c429b1..55568ccd6 100644 --- a/docs/_includes/css/rtl.html +++ b/docs/_includes/css/rtl.html @@ -8,13 +8,18 @@ {% endhighlight %} -

    Then, include the right-to-left CSS file in place of the default Bootstrap CSS:

    +

    Then, include the right-to-left CSS file instead of the default Bootstrap CSS:

    {% highlight html %} {% endhighlight %}

    Alternatively, you may use the minified RTL file, bootstrap-rtl.min.css.

    +
    +

    Do not use in combination with bootstrap.css

    +

    bootstrap-rtl.css must not be used together with bootstrap.css. Use either one or the other, but not both. bootstrap-rtl.css includes all of Bootstrap's styles, including those not affected by writing direction.

    +
    +

    CSS Flip

    CSS Flip is a project for converting left-to-right CSS files into right-to-left CSS files. We use it in our Gruntfile to automate the generation of Bootstrap's RTL CSS files.

    -- cgit v1.2.3 From ed410667dfd95502b3674806e7ad7b2b79a5627b Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Sun, 4 May 2014 09:02:55 -0700 Subject: Fix .visible-print deprecation version #. --- docs/_includes/css/responsive-utilities.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/css/responsive-utilities.html b/docs/_includes/css/responsive-utilities.html index 260eea3cc..666c0bce7 100644 --- a/docs/_includes/css/responsive-utilities.html +++ b/docs/_includes/css/responsive-utilities.html @@ -93,7 +93,7 @@
    Android Supported Not Supported Supported N/A Not Supported N/A
    -

    As of v3.2, the .visible-*-* classes for each breakpoint come in three variations, one for each CSS display property value listed below.

    +

    As of v3.2.0, the .visible-*-* classes for each breakpoint come in three variations, one for each CSS display property value listed below.

    @@ -119,7 +119,7 @@

    So, for extra small (xs) screens for example, the available .visible-*-* classes are: .visible-xs-block, .visible-xs-inline, and .visible-xs-inline-block.

    -

    The classes .visible-xs, .visible-sm, .visible-md, and .visible-lg also exist, but are deprecated as of v3.2. They are approximately equivalent to .visible-*-block, except with additional special cases for toggling <table>-related elements.

    +

    The classes .visible-xs, .visible-sm, .visible-md, and .visible-lg also exist, but are deprecated as of v3.2.0. They are approximately equivalent to .visible-*-block, except with additional special cases for toggling <table>-related elements.

    Print classes

    Similar to the regular responsive classes, use these for toggling content for print.

    @@ -150,7 +150,7 @@
    -

    The class .visible-print also exists but is deprecated as of v3.1.0. It is approximately equivalent to .visible-print-block, except with additional special cases for <table>-related elements.

    +

    The class .visible-print also exists but is deprecated as of v3.2.0. It is approximately equivalent to .visible-print-block, except with additional special cases for <table>-related elements.

    Test cases

    -- cgit v1.2.3 From d36c150569c982a24935bfc90e77e7a59986497b Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 6 May 2014 11:34:46 -0700 Subject: tweak formatting in Carousel docs for clarity; fixes #13522 --- docs/_includes/js/carousel.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html index 2b5b0111b..fa7476b68 100644 --- a/docs/_includes/js/carousel.html +++ b/docs/_includes/js/carousel.html @@ -128,7 +128,7 @@

    Multiple carousels

    -

    Carousels require the use of an id on the outermost container, .carousel, for carousel controls to function properly. When adding multiple carousels, or when changing a carousel's id, be sure to update the relevant controls.

    +

    Carousels require the use of an id on the outermost container (the .carousel) for carousel controls to function properly. When adding multiple carousels, or when changing a carousel's id, be sure to update the relevant controls.

    Via data attributes

    Use data attributes to easily control the position of the carousel. data-slide accepts the keywords prev or next, which alters the slide position relative to its current position. Alternatively, use data-slide-to to pass a raw slide index to the carousel data-slide-to="2", which shifts the slide position to a particular index beginning with 0.

    -- cgit v1.2.3 From f0daa64a29a66a663f6fedb9d8687524af754436 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 7 May 2014 15:30:27 -0700 Subject: move rtl to getting started, per @cvrebert's feedback --- docs/_includes/css/rtl.html | 25 ------------------------- docs/_includes/getting-started/rtl.html | 25 +++++++++++++++++++++++++ docs/_includes/nav/getting-started.html | 7 +++++++ 3 files changed, 32 insertions(+), 25 deletions(-) delete mode 100644 docs/_includes/css/rtl.html create mode 100644 docs/_includes/getting-started/rtl.html (limited to 'docs/_includes') diff --git a/docs/_includes/css/rtl.html b/docs/_includes/css/rtl.html deleted file mode 100644 index 55568ccd6..000000000 --- a/docs/_includes/css/rtl.html +++ /dev/null @@ -1,25 +0,0 @@ -
    -

    RTL

    -

    As of Bootstrap 3.2, a right-to-left version of Bootstrap ships as part of the repository. It's powered by Twitter's CSS Flip project and is generated via our Gruntfile.

    - -

    How to use

    -

    Bootstrap is by default a left-to-right project. For right-to-left projects, you'll need to set your language and replace the default Bootstrap CSS with an RTL version. First, set your language and text direction:

    -{% highlight html %} - - -{% endhighlight %} -

    Then, include the right-to-left CSS file instead of the default Bootstrap CSS:

    -{% highlight html %} - - -{% endhighlight %} -

    Alternatively, you may use the minified RTL file, bootstrap-rtl.min.css.

    - -
    -

    Do not use in combination with bootstrap.css

    -

    bootstrap-rtl.css must not be used together with bootstrap.css. Use either one or the other, but not both. bootstrap-rtl.css includes all of Bootstrap's styles, including those not affected by writing direction.

    -
    - -

    CSS Flip

    -

    CSS Flip is a project for converting left-to-right CSS files into right-to-left CSS files. We use it in our Gruntfile to automate the generation of Bootstrap's RTL CSS files.

    -
    diff --git a/docs/_includes/getting-started/rtl.html b/docs/_includes/getting-started/rtl.html new file mode 100644 index 000000000..55568ccd6 --- /dev/null +++ b/docs/_includes/getting-started/rtl.html @@ -0,0 +1,25 @@ +
    +

    RTL

    +

    As of Bootstrap 3.2, a right-to-left version of Bootstrap ships as part of the repository. It's powered by Twitter's CSS Flip project and is generated via our Gruntfile.

    + +

    How to use

    +

    Bootstrap is by default a left-to-right project. For right-to-left projects, you'll need to set your language and replace the default Bootstrap CSS with an RTL version. First, set your language and text direction:

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

    Then, include the right-to-left CSS file instead of the default Bootstrap CSS:

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

    Alternatively, you may use the minified RTL file, bootstrap-rtl.min.css.

    + +
    +

    Do not use in combination with bootstrap.css

    +

    bootstrap-rtl.css must not be used together with bootstrap.css. Use either one or the other, but not both. bootstrap-rtl.css includes all of Bootstrap's styles, including those not affected by writing direction.

    +
    + +

    CSS Flip

    +

    CSS Flip is a project for converting left-to-right CSS files into right-to-left CSS files. We use it in our Gruntfile to automate the generation of Bootstrap's RTL CSS files.

    +
    diff --git a/docs/_includes/nav/getting-started.html b/docs/_includes/nav/getting-started.html index e253bf1c1..494a2950f 100644 --- a/docs/_includes/nav/getting-started.html +++ b/docs/_includes/nav/getting-started.html @@ -20,6 +20,13 @@
  • Experiments
    • +
  • + RTL version + +
  • Community
    • -- cgit v1.2.3 From 7d0f7e84412ab8018e6e9211f9e6a0f47d1100ce Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 29 Apr 2014 15:54:05 -0700 Subject: add button to toggle the optional theme when viewing the docs; fixes #9764 --- docs/_includes/header.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/header.html b/docs/_includes/header.html index e12545ecc..87d20a132 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -15,6 +15,10 @@ +{% if page.slug == "css" or page.slug == "components" or page.slug == "js" %} + + +{% endif %} -- cgit v1.2.3 From 5d8880fdfae7de50d867eb9695b704f50ab77775 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 7 May 2014 19:38:27 -0700 Subject: move Grunt info from README into HTML docs Fixes #13470 --- docs/_includes/getting-started/grunt.html | 32 +++++++++++++++++++++++++++++++ docs/_includes/nav/getting-started.html | 8 ++++++++ 2 files changed, 40 insertions(+) create mode 100644 docs/_includes/getting-started/grunt.html (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/grunt.html b/docs/_includes/getting-started/grunt.html new file mode 100644 index 000000000..93fa44a70 --- /dev/null +++ b/docs/_includes/getting-started/grunt.html @@ -0,0 +1,32 @@ +
    +

    Compiling CSS and JavaScript

    + +

    Bootstrap uses Grunt for its build system, with convenient methods for working with the framework. It's how we compile our code, run tests, and more.

    + +

    Installing Grunt

    +

    To install Grunt, you must first download and install node.js (which includes npm). npm stands for node packaged modules and is a way to manage development dependencies through node.js.

    + + Then, from the command line: +
      +
    1. Install grunt-cli globally with npm install -g grunt-cli.
      2. +
    2. Navigate to the root /bootstrap/ directory, then run npm install. npm will look at the package.json file and automatically install the necessary local dependencies listed there.
      3. +
    + +

    When completed, you'll be able to run the various Grunt commands provided from the command line.

    + +

    Available Grunt commands

    +

    grunt dist (Just compile CSS and JavaScript)

    +

    Regenerates the /dist/ directory with compiled and minified CSS and JavaScript files. As a Bootstrap user, this is normally the command you want.

    + +

    grunt watch (Watch)

    +

    Watches the Less source files and automatically recompiles them to CSS whenever you save a change.

    + +

    grunt test (Run tests)

    +

    Runs JSHint and runs the QUnit tests headlessly in PhantomJS.

    + +

    grunt (Build absolutely everything and run tests)

    +

    Compiles and minifies CSS and JavaScript, builds the documentation website, runs the HTML5 validator against the docs, regenerates the Customizer assets, and more. Usually only necessary if you're hacking on Bootstrap itself.

    + +

    Troubleshooting

    +

    Should you encounter problems with installing dependencies or running Grunt commands, first delete the /node_modules/ directory generated by npm. Then, rerun npm install.

    +
    diff --git a/docs/_includes/nav/getting-started.html b/docs/_includes/nav/getting-started.html index 494a2950f..df94dc099 100644 --- a/docs/_includes/nav/getting-started.html +++ b/docs/_includes/nav/getting-started.html @@ -8,6 +8,14 @@
  • Source code
    • +
  • + Compiling CSS and JavaScript + +
  • Basic template
    • -- cgit v1.2.3 From bdd822a94cdf2d452e067569e76ca1537dc74d8d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 29 Apr 2014 15:56:18 -0700 Subject: regenerate minified docs JS & CSS --- docs/_includes/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/header.html b/docs/_includes/header.html index 87d20a132..c9e38e25c 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -17,7 +17,7 @@ {% if page.slug == "css" or page.slug == "components" or page.slug == "js" %} - + {% endif %} -- cgit v1.2.3 From 5f6304bd65e01320ca93f80445d978ca37f59a01 Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Thu, 8 May 2014 07:20:25 -0700 Subject: Remove outdated rtl nav links --- docs/_includes/nav/css.html | 7 ------- 1 file changed, 7 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/nav/css.html b/docs/_includes/nav/css.html index f2b1b5420..5a8d86368 100644 --- a/docs/_includes/nav/css.html +++ b/docs/_includes/nav/css.html @@ -133,10 +133,3 @@
  • Rails install
    • -
  • - RTL version - -
    • -- cgit v1.2.3 From e9374c0609c9e63fd6033f684b18ff105e1756ae Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 9 May 2014 15:05:20 -0700 Subject: add role="tablist" to .nav-tabs in examples to improve accessibility Per https://github.com/paypal/bootstrap-accessibility-plugin#tab-panel Credit: https://github.com/paypal/bootstrap-accessibility-plugin --- docs/_includes/components/navs.html | 12 ++++++------ docs/_includes/js/scrollspy.html | 2 +- docs/_includes/js/tabs.html | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/components/navs.html b/docs/_includes/components/navs.html index 9cad335d0..d9c45fa2d 100644 --- a/docs/_includes/components/navs.html +++ b/docs/_includes/components/navs.html @@ -6,14 +6,14 @@

    Note the .nav-tabs class requires the .nav base class.

    -
    {% highlight html %} -
      +
      • Home
      • Profile
      • Messages
        • @@ -62,7 +62,7 @@

        As of v7.0.1, Safari exhibits a bug in which resizing your browser horizontally causes rendering errors in the justified nav that are cleared upon refreshing. This bug is also shown in the justified nav example.

    -
    {% highlight html %} -
    - + - +
    @@ -102,10 +102,10 @@ - + - + -- cgit v1.2.3 From ed98b3dfc012166d01c72fc80caa0113e37b4d45 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 10 May 2014 09:22:43 +0300 Subject: Update html5shiv to 3.7.2. --- docs/_includes/getting-started/template.html | 2 +- docs/_includes/header.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/template.html b/docs/_includes/getting-started/template.html index de0515342..c3b1560aa 100644 --- a/docs/_includes/getting-started/template.html +++ b/docs/_includes/getting-started/template.html @@ -19,7 +19,7 @@ diff --git a/docs/_includes/header.html b/docs/_includes/header.html index e12545ecc..e345c2dae 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -25,7 +25,7 @@ -- cgit v1.2.3 From 96bdc56fdebca9ec7d024d2fd07bf766b1e1881e Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 10 May 2014 13:31:18 -0700 Subject: cleanup --- docs/_includes/header.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/header.html b/docs/_includes/header.html index e345c2dae..182664d5a 100644 --- a/docs/_includes/header.html +++ b/docs/_includes/header.html @@ -31,15 +31,13 @@ - + -- cgit v1.2.3 From be00b82bb95c6defc02a66f2d599fec56fbcaa85 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 12 May 2014 19:55:58 -0700 Subject: nuke the rtl docs --- docs/_includes/getting-started/rtl.html | 25 ------------------------- docs/_includes/nav/getting-started.html | 7 ------- 2 files changed, 32 deletions(-) delete mode 100644 docs/_includes/getting-started/rtl.html (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/rtl.html b/docs/_includes/getting-started/rtl.html deleted file mode 100644 index 55568ccd6..000000000 --- a/docs/_includes/getting-started/rtl.html +++ /dev/null @@ -1,25 +0,0 @@ -
    -

    RTL

    -

    As of Bootstrap 3.2, a right-to-left version of Bootstrap ships as part of the repository. It's powered by Twitter's CSS Flip project and is generated via our Gruntfile.

    - -

    How to use

    -

    Bootstrap is by default a left-to-right project. For right-to-left projects, you'll need to set your language and replace the default Bootstrap CSS with an RTL version. First, set your language and text direction:

    -{% highlight html %} - - -{% endhighlight %} -

    Then, include the right-to-left CSS file instead of the default Bootstrap CSS:

    -{% highlight html %} - - -{% endhighlight %} -

    Alternatively, you may use the minified RTL file, bootstrap-rtl.min.css.

    - -
    -

    Do not use in combination with bootstrap.css

    -

    bootstrap-rtl.css must not be used together with bootstrap.css. Use either one or the other, but not both. bootstrap-rtl.css includes all of Bootstrap's styles, including those not affected by writing direction.

    -
    - -

    CSS Flip

    -

    CSS Flip is a project for converting left-to-right CSS files into right-to-left CSS files. We use it in our Gruntfile to automate the generation of Bootstrap's RTL CSS files.

    -
    diff --git a/docs/_includes/nav/getting-started.html b/docs/_includes/nav/getting-started.html index df94dc099..fae906920 100644 --- a/docs/_includes/nav/getting-started.html +++ b/docs/_includes/nav/getting-started.html @@ -28,13 +28,6 @@
  • Experiments
    • -
  • - RTL version - -
  • Community
    • -- cgit v1.2.3 From 7a765d1f8b45dd10d40e6c9ac5ad144ff95a9b0d Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 13 May 2014 08:33:23 +0300 Subject: Update jQuery to v1.11.1. --- docs/_includes/footer.html | 2 +- docs/_includes/getting-started/template.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 6d626a198..0bb3eafd3 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -32,7 +32,7 @@ - + {% if page.slug == "customize" %} diff --git a/docs/_includes/getting-started/template.html b/docs/_includes/getting-started/template.html index c3b1560aa..3952621a6 100644 --- a/docs/_includes/getting-started/template.html +++ b/docs/_includes/getting-started/template.html @@ -27,7 +27,7 @@

    Hello, world!

    - + -- cgit v1.2.3 From d0fca8aaad4999d3389ebdada36102c89063e0f2 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Tue, 13 May 2014 09:26:24 +0300 Subject: Remove RTL leftovers. --- docs/_includes/getting-started/download.html | 3 --- docs/_includes/getting-started/whats-included.html | 2 -- 2 files changed, 5 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html index b457d038e..c89c8b9e4 100644 --- a/docs/_includes/getting-started/download.html +++ b/docs/_includes/getting-started/download.html @@ -33,9 +33,6 @@ - - - diff --git a/docs/_includes/getting-started/whats-included.html b/docs/_includes/getting-started/whats-included.html index 278ebac60..8500e573c 100644 --- a/docs/_includes/getting-started/whats-included.html +++ b/docs/_includes/getting-started/whats-included.html @@ -17,8 +17,6 @@ bootstrap/ ├── css/ │ ├── bootstrap.css │ ├── bootstrap.min.css -│ ├── bootstrap-rtl.css -│ ├── bootstrap-rtl.min.css │ ├── bootstrap-theme.css │ └── bootstrap-theme.min.css ├── js/ -- cgit v1.2.3 From 239d5e0e3905c4463651fc94a9ed175bdc2e827c Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 13 May 2014 04:19:51 -0700 Subject: add link to StackOverflow question regarding Android +
    - +
    - +
    - +
    - +
    - +
    @@ -726,7 +730,7 @@
    - +
    -- cgit v1.2.3 From 7f4af4aeeac5e93dcb69b5c820e8e791077cc787 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 5 Jul 2014 23:42:30 -0700 Subject: `remote` modal docs: mention jQuery.load and other JS options as alternatives [skip sauce] --- docs/_includes/js/modal.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/modal.html b/docs/_includes/js/modal.html index f8ad8e33e..d5b1aee84 100644 --- a/docs/_includes/js/modal.html +++ b/docs/_includes/js/modal.html @@ -259,7 +259,9 @@ remote path false -

    This option is deprecated since v3.2.1 and will be removed in v4.

    If a remote URL is provided, content will be loaded one time via jQuery's load method and injected into the .modal-content div. If you're using the data-api, you may alternatively use the href attribute to specify the remote source. An example of this is shown below:

    + +

    This option is deprecated since v3.2.1 and will be removed in v4. We recommend instead using client-side templating or a data binding framework, or calling jQuery.load yourself.

    +

    If a remote URL is provided, content will be loaded one time via jQuery's load method and injected into the .modal-content div. If you're using the data-api, you may alternatively use the href attribute to specify the remote source. An example of this is shown below:

    {% highlight html %} Click me {% endhighlight %} -- cgit v1.2.3 From 5e41a23ec5da02e67be2a67dd0c692517b3b01bd Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 6 Jul 2014 16:55:35 -0700 Subject: Fixes #13835: More explicitly document mobile dropdown menu dismissing behavior --- docs/_includes/js/dropdowns.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/dropdowns.html b/docs/_includes/js/dropdowns.html index b32a2c033..31ca8b560 100644 --- a/docs/_includes/js/dropdowns.html +++ b/docs/_includes/js/dropdowns.html @@ -96,7 +96,9 @@ -

    Via data attributes or JavaScript, the dropdown plugin toggles hidden content (dropdown menus) by toggling the .open class on the parent list item. When opened, the plugin also adds .dropdown-backdrop as a click area for closing dropdown menus when clicking outside the menu. Note: The data-toggle=dropdown attribute is relied on for closing dropdown menus at an application level, so it's a good idea to always use it.

    +

    Via data attributes or JavaScript, the dropdown plugin toggles hidden content (dropdown menus) by toggling the .open class on the parent list item.

    +

    On mobile devices, opening a dropdown adds a .dropdown-backdrop as a tap area for closing dropdown menus when tapping outside the menu, a requirement for proper iOS support. This means switching to another dropdown menu requires an extra tap on mobile.

    +

    Note: The data-toggle=dropdown attribute is relied on for closing dropdown menus at an application level, so it's a good idea to always use it.

    Via data attributes

    Add data-toggle="dropdown" to a link or button to toggle a dropdown.

    -- cgit v1.2.3 From 8e2348e9eda51296eb680192379ab37f10355ca3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 6 Jul 2014 18:39:37 -0700 Subject: Fixes #13746: Add docs section for brand image --- docs/_includes/components/navbar.html | 26 ++++++++++++++++++++++++++ docs/_includes/nav/components.html | 1 + 2 files changed, 27 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/components/navbar.html b/docs/_includes/components/navbar.html index 498b78af2..560eca8a7 100644 --- a/docs/_includes/components/navbar.html +++ b/docs/_includes/components/navbar.html @@ -144,6 +144,32 @@
    + +

    Replace the navbar brand with your own image by swapping the text for an <img>. Since the .navbar-brand has it's own padding and height, you may need to override some CSS depending on your image.

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

    Place form content within .navbar-form for proper vertical alignment and collapsed behavior in narrow viewports. Use the alignment options to decide where it resides within the navbar content.

    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.

    diff --git a/docs/_includes/nav/components.html b/docs/_includes/nav/components.html index 647e1ec81..ebc0c904f 100644 --- a/docs/_includes/nav/components.html +++ b/docs/_includes/nav/components.html @@ -60,6 +60,7 @@ Navbar
    • Default navbar
      • +
    • Brand image
    • Forms
    • Buttons
    • Text
      • -- cgit v1.2.3 From ddffe769613dd94c7125e3a7a2546cc706f5e2b5 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 7 Jul 2014 00:04:14 -0700 Subject: grammar fix; indicate that img[src] shouldn't actually be empty --- docs/_includes/components/navbar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/components/navbar.html b/docs/_includes/components/navbar.html index 560eca8a7..7fa098c09 100644 --- a/docs/_includes/components/navbar.html +++ b/docs/_includes/components/navbar.html @@ -145,7 +145,7 @@ -

      Replace the navbar brand with your own image by swapping the text for an <img>. Since the .navbar-brand has it's own padding and height, you may need to override some CSS depending on your image.

      +

      Replace the navbar brand with your own image by swapping the text for an <img>. Since the .navbar-brand has its own padding and height, you may need to override some CSS depending on your image.