diff options
| author | Mark Otto <[email protected]> | 2014-05-07 15:28:08 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-07 15:28:08 -0700 |
| commit | 7408917887bc3c722ff5c4f892c2ba2f992e0cfd (patch) | |
| tree | 67d45022d862ee9bbd307dd3fdc83dc7ef92a376 | |
| parent | 16cff71ba487b75b1db2e639d9f2a26dc385bdf9 (diff) | |
| parent | f71f2dbeb0ebafe0d8255317001396ce9ddb7e55 (diff) | |
| download | bootstrap-7408917887bc3c722ff5c4f892c2ba2f992e0cfd.tar.xz bootstrap-7408917887bc3c722ff5c4f892c2ba2f992e0cfd.zip | |
Merge pull request #13499 from twbs/clarify-rtl
emphasize that bootstrap-rtl.css & bootstrap.css should not be used together
| -rw-r--r-- | docs/_includes/css/rtl.html | 7 |
1 files changed, 6 insertions, 1 deletions
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 @@ <!-- Example: Arabic language with direction set to RTL --> <html lang="ar" dir="rtl"> {% endhighlight %} - <p>Then, include the right-to-left CSS file in place of the default Bootstrap CSS:</p> + <p>Then, include the right-to-left CSS file <strong>instead of</strong> the default Bootstrap CSS:</p> {% highlight html %} <!-- Bootstrap RTL --> <link rel="stylesheet" href="bootstrap-rtl.css"> {% endhighlight %} <p>Alternatively, you may use the minified RTL file, <code>bootstrap-rtl.min.css</code>.</p> + <div class="bs-callout bs-callout-danger"> + <h4>Do not use in combination with <code>bootstrap.css</code></h4> + <p><code>bootstrap-rtl.css</code> must not be used together with <code>bootstrap.css</code>. Use either one or the other, but not both. <code>bootstrap-rtl.css</code> includes all of Bootstrap's styles, including those not affected by writing direction.</p> + </div> + <h2 id="rtl-css-flip">CSS Flip</h2> <p><a href="https://github.com/twitter/css-flip">CSS Flip</a> 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.</p> </div> |