diff options
| author | Mark Otto <[email protected]> | 2014-05-12 19:57:49 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-05-12 19:57:49 -0700 |
| commit | 31956be6ef6d1b1a2537c3441e69120ef3c99a2b (patch) | |
| tree | a118376f0f415826265828377904778f8e788b44 /docs/_includes/getting-started | |
| parent | 510f4fe50ad30499adf1d19dd65ef694c414aacd (diff) | |
| parent | be18f50fd0e36e35342a100216b01fe00692d0db (diff) | |
| download | bootstrap-31956be6ef6d1b1a2537c3441e69120ef3c99a2b.tar.xz bootstrap-31956be6ef6d1b1a2537c3441e69120ef3c99a2b.zip | |
Merge branch 'master' into icon_paths
Conflicts:
dist/css/bootstrap-rtl.css
dist/css/bootstrap.css.map
dist/js/bootstrap.min.js
docs/dist/css/bootstrap.css.map
docs/dist/js/bootstrap.min.js
Diffstat (limited to 'docs/_includes/getting-started')
| -rw-r--r-- | docs/_includes/getting-started/rtl.html | 25 | ||||
| -rw-r--r-- | docs/_includes/getting-started/template.html | 2 |
2 files changed, 1 insertions, 26 deletions
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 @@ -<div class="bs-docs-section"> - <h1 id="rtl" class="page-header">RTL</h1> - <p class="lead">As of Bootstrap 3.2, a right-to-left version of Bootstrap ships as part of the repository. It's powered by Twitter's <a href="https://github.com/twitter/css-flip">CSS Flip project</a> and is generated via our Gruntfile.</p> - - <h2 id="rtl-how-to">How to use</h2> - <p>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:</p> -{% highlight html %} -<!-- Example: Arabic language with direction set to RTL --> -<html lang="ar" dir="rtl"> -{% endhighlight %} - <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> 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 @@ <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> <!--[if lt IE 9]> - <script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script> + <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script> <![endif]--> </head> |