From 1b15cefa5c5342129bec9b794946f3fb2641077d Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
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/getting-started')

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 @@
 
   <p class="lead">Community members have translated Bootstrap's documentation into various languages. None are officially supported and they may not always be up to date.</p>
   <ul>
-    <li><a href="http://v3.bootcss.com/">Bootstrap 中文文档 (Chinese)</a></li>
-    <li><a href="http://www.oneskyapp.com/docs/bootstrap/fr">Bootstrap en Français (French)</a></li>
-    <li><a href="http://holdirbootstrap.de/">Bootstrap auf Deutsch (German)</a></li>
-    <li><a href="http://bootstrapk.com/BS3/">Bootstrap 한국어 (Korean)</a></li>
-    <li><a href="http://www.oneskyapp.com/docs/bootstrap/ru">Bootstrap по-русски (Russian)</a></li>
-    <li><a href="http://www.oneskyapp.com/docs/bootstrap/es">Bootstrap en Español (Spanish)</a></li>
-    <li><a href="http://twbs.site-konstruktor.com.ua">Bootstrap ua Українською (Ukrainian)</a></li>
+    {% for language in site.data.translations %}
+      <li><a href="{{ language.url }}" hreflang="{{ language.code }}">{{ language.description }} ({{ language.name }})</a></li>
+    {% endfor %}
   </ul>
   <p><strong class="text-danger">We don't help organize or host translations, we just link to them.</strong></p>
   <p>Finished a new or better translation? Open a pull request to add it to our list.</p>
-- 
cgit v1.2.3


From a696d47592ef19510087113fa8e88af31a6491e0 Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Thu, 27 Mar 2014 21:26:21 +0100
Subject: Change GA events to Universal Analytics

---
 docs/_includes/getting-started/download.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/_includes/getting-started')

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 @@
       <h3 id="download-bootstrap">Bootstrap</h3>
       <p>Compiled and minified CSS, JavaScript, and fonts. No docs or original source files are included.</p>
       <p>
-        <a href="{{ site.download.dist }}" class="btn btn-lg btn-outline" role="button" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a>
+        <a href="{{ site.download.dist }}" class="btn btn-lg btn-outline" role="button" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download compiled');">Download Bootstrap</a>
       </p>
     </div>
     <div class="col-sm-4">
       <h3 id="download-source">Source code</h3>
       <p>Source Less, JavaScript, and font files, along with our docs. <strong>Requires a Less compiler and <a href="{{ site.repo }}#compiling-css-and-javascript">some setup.</a></strong></p>
       <p>
-        <a href="{{ site.download.source }}" class="btn btn-lg btn-outline" role="button" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download source</a>
+        <a href="{{ site.download.source }}" class="btn btn-lg btn-outline" role="button" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download source');">Download source</a>
       </p>
     </div>
     <div class="col-sm-4">
       <h3 id="download-sass">Sass</h3>
       <p><a href="{{ site.sass_repo }}">Bootstrap ported from Less to Sass</a> for easy inclusion in Rails, Compass, or Sass-only projects.</p>
       <p>
-        <a href="{{ site.download.sass }}" class="btn btn-lg btn-outline" role="button" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download Sass']);">Download Sass</a>
+        <a href="{{ site.download.sass }}" class="btn btn-lg btn-outline" role="button" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download Sass');">Download Sass</a>
       </p>
     </div>
   </div>
-- 
cgit v1.2.3


From b57396944a39b21571848728b6ad479cd50537cd Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
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/getting-started')

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 @@
       <h4>Offcanvas</h4>
       <p>Build a toggleable off-canvas navigation menu for use with Bootstrap.</p>
     </div>
+    <div class="col-xs-6 col-md-4">
+      <a class="thumbnail" href="../examples/equal-height-columns/">
+        <img src="../examples/screenshots/equal-height-columns.jpg" alt="">
+      </a>
+      <h4>Equal-height grid columns</h4>
+      <p>Adds automatic equal-height grid columns to Bootstrap's grid system.</p>
+    </div>
   </div>
 </div>
-- 
cgit v1.2.3


From b2a67ffe55f5fedb0ae1d5dff331687c3e744be0 Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
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 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/_includes/getting-started')

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 @@
       <h3 id="download-bootstrap">Bootstrap</h3>
       <p>Compiled and minified CSS, JavaScript, and fonts. No docs or original source files are included.</p>
       <p>
-        <a href="{{ site.download.dist }}" class="btn btn-lg btn-outline" role="button" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download compiled');">Download Bootstrap</a>
+        <a href="{{ site.download.dist }}" class="btn btn-lg btn-outline" role="button" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a>
       </p>
     </div>
     <div class="col-sm-4">
       <h3 id="download-source">Source code</h3>
       <p>Source Less, JavaScript, and font files, along with our docs. <strong>Requires a Less compiler and <a href="{{ site.repo }}#compiling-css-and-javascript">some setup.</a></strong></p>
       <p>
-        <a href="{{ site.download.source }}" class="btn btn-lg btn-outline" role="button" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download source');">Download source</a>
+        <a href="{{ site.download.source }}" class="btn btn-lg btn-outline" role="button" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download source</a>
       </p>
     </div>
     <div class="col-sm-4">
       <h3 id="download-sass">Sass</h3>
       <p><a href="{{ site.sass_repo }}">Bootstrap ported from Less to Sass</a> for easy inclusion in Rails, Compass, or Sass-only projects.</p>
       <p>
-        <a href="{{ site.download.sass }}" class="btn btn-lg btn-outline" role="button" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download Sass');">Download Sass</a>
+        <a href="{{ site.download.sass }}" class="btn btn-lg btn-outline" role="button" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download Sass']);">Download Sass</a>
       </p>
     </div>
   </div>
-- 
cgit v1.2.3


From e59da022308c613deae3091723d5517bdaee9e43 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
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/getting-started')

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/)) {
   <p>On <code>&lt;select&gt;</code> elements, the Android stock browser will not display the side controls if there is a <code>border-radius</code> and/or <code>border</code> applied. Use the snippet of code below to remove the offending CSS and render the <code>&lt;select&gt;</code> as an unstyled element on the Android stock browser. The user agent sniffing avoids interference with Chrome, Safari, and Mozilla browsers.</p>
 {% highlight html %}
 <script>
-var nua = navigator.userAgent
-var isAndroid = (nua.indexOf('Mozilla/5.0') > -1 && nua.indexOf('Android ') > -1 && nua.indexOf('AppleWebKit') > -1 && nua.indexOf('Chrome') === -1)
-if (isAndroid) {
-  $('select.form-control').removeClass('form-control').css('width', '100%')
-}
+$(function () {
+  var nua = navigator.userAgent
+  var isAndroid = (nua.indexOf('Mozilla/5.0') > -1 && nua.indexOf('Android ') > -1 && nua.indexOf('AppleWebKit') > -1 && nua.indexOf('Chrome') === -1)
+  if (isAndroid) {
+    $('select.form-control').removeClass('form-control').css('width', '100%')
+  }
+})
 </script>
 {% endhighlight %}
   <p>Want to see an example? <a href="http://jsbin.com/OyaqoDO/2">Check out this JS Bin demo.</a></p>
-- 
cgit v1.2.3


From fa9e541f5e9aa9ce5ea039166826c5f195585daa Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
Date: Fri, 4 Apr 2014 10:28:45 +0200
Subject: Re-implement Universal Analytics

X-Refs:
https://github.com/twbs/bootstrap/commit/b2a67ffe55f5fedb0ae1d5dff331687c3e744be0
https://github.com/twbs/bootstrap/commit/c97e6d5cad74d20257d28734f85311ef5d00b560
---
 docs/_includes/getting-started/download.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'docs/_includes/getting-started')

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 @@
       <h3 id="download-bootstrap">Bootstrap</h3>
       <p>Compiled and minified CSS, JavaScript, and fonts. No docs or original source files are included.</p>
       <p>
-        <a href="{{ site.download.dist }}" class="btn btn-lg btn-outline" role="button" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download compiled']);">Download Bootstrap</a>
+        <a href="{{ site.download.dist }}" class="btn btn-lg btn-outline" role="button" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download compiled');">Download Bootstrap</a>
       </p>
     </div>
     <div class="col-sm-4">
       <h3 id="download-source">Source code</h3>
       <p>Source Less, JavaScript, and font files, along with our docs. <strong>Requires a Less compiler and <a href="{{ site.repo }}#compiling-css-and-javascript">some setup.</a></strong></p>
       <p>
-        <a href="{{ site.download.source }}" class="btn btn-lg btn-outline" role="button" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download source']);">Download source</a>
+        <a href="{{ site.download.source }}" class="btn btn-lg btn-outline" role="button" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download source');">Download source</a>
       </p>
     </div>
     <div class="col-sm-4">
       <h3 id="download-sass">Sass</h3>
       <p><a href="{{ site.sass_repo }}">Bootstrap ported from Less to Sass</a> for easy inclusion in Rails, Compass, or Sass-only projects.</p>
       <p>
-        <a href="{{ site.download.sass }}" class="btn btn-lg btn-outline" role="button" onclick="_gaq.push(['_trackEvent', 'Getting started', 'Download', 'Download Sass']);">Download Sass</a>
+        <a href="{{ site.download.sass }}" class="btn btn-lg btn-outline" role="button" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download Sass');">Download Sass</a>
       </p>
     </div>
   </div>
-- 
cgit v1.2.3


From a549e8c332c44ed3b79e3250a0a0d87cc06f7e00 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Mon, 21 Apr 2014 19:11:23 +0300
Subject: Update html5shiv to v3.7.1.

---
 docs/_includes/getting-started/template.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/template.html b/docs/_includes/getting-started/template.html
index c6a1646d6..5e0854977 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/libs/html5shiv/3.7.0/html5shiv.js"></script>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.1/html5shiv.min.js"></script>
       <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
   </head>
-- 
cgit v1.2.3


From 52b6a3214574de58bee6e08049e5b477bb4f226c Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Mon, 21 Apr 2014 19:12:43 +0300
Subject: Use the new respond.js URL.

---
 docs/_includes/getting-started/template.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/template.html b/docs/_includes/getting-started/template.html
index 5e0854977..de0515342 100644
--- a/docs/_includes/getting-started/template.html
+++ b/docs/_includes/getting-started/template.html
@@ -20,7 +20,7 @@
     <!-- 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/libs/respond.js/1.4.2/respond.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
   </head>
   <body>
-- 
cgit v1.2.3


From 588889cdc5908279c59ca418da3ad4f4e8dd235a Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Sat, 3 May 2014 22:56:45 -0700
Subject: document #13390

---
 docs/_includes/getting-started/browser-device-support.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html
index 183bb7668..aeb804ca1 100644
--- a/docs/_includes/getting-started/browser-device-support.html
+++ b/docs/_includes/getting-started/browser-device-support.html
@@ -112,7 +112,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 {% endhighlight %}
   <p>Confirm the document mode by opening the debugging tools: press <kbd>F12</kbd> and check the "Document Mode".</p>
-  <p>This tag is included in all Bootstrap's documentation and examples to ensure the best rendering possible in each supported version of Internet Explorer.</p>
+  <p>This tag is included in all of Bootstrap's documentation and examples to ensure the best rendering possible in each supported version of Internet Explorer.</p>
   <p>See <a href="http://stackoverflow.com/questions/6771258/whats-the-difference-if-meta-http-equiv-x-ua-compatible-content-ie-edge">this StackOverflow question</a> for more information.</p>
 
   <h3 id="support-ie10-width">Internet Explorer 10 in Windows 8 and Windows Phone 8</h3>
@@ -141,7 +141,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
 }
 {% endhighlight %}
   <p>For more information and usage guidelines, read <a href="http://timkadlec.com/2013/01/windows-phone-8-and-device-width/">Windows Phone 8 and Device-Width</a>.</p>
-  <p>As a heads up, we include this in the Bootstrap docs as an example.</p>
+  <p>As a heads up, we include this in all of Bootstrap's documentation and examples as a demonstration.</p>
 
   <h3 id="support-safari-percentages">Safari percent rounding</h3>
   <p>As of Safari v7.0.1 for OS X and Safari for iOS v7.0.1, Safari's rendering engine has some trouble with the number of decimal places used in our <code>.col-*-1</code> grid classes. So if you have 12 individual grid columns, you'll notice that they come up short compared to other rows of columns. We can't do much here (<a href="https://github.com/twbs/bootstrap/issues/9282">see #9282</a>) but you do have some options:</p>
-- 
cgit v1.2.3


From c4a3848d57b3d9760a8057ace2fec3eb1d2362a8 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Sat, 3 May 2014 23:02:48 -0700
Subject: mark Android Firefox as officially supported

---
 docs/_includes/getting-started/browser-device-support.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html
index 183bb7668..260a3d3cb 100644
--- a/docs/_includes/getting-started/browser-device-support.html
+++ b/docs/_includes/getting-started/browser-device-support.html
@@ -20,7 +20,7 @@
         <tr>
           <th>Android</th>
           <td class="text-success"><span class="glyphicon glyphicon-ok"></span> <span class="sr-only">Supported</span></td>
-          <td class="text-danger"><span class="glyphicon glyphicon-remove"></span> <span class="sr-only">Not Supported</span></td>
+          <td class="text-success"><span class="glyphicon glyphicon-ok"></span> <span class="sr-only">Supported</span></td>
           <td class="text-muted" rowspan="3" style="vertical-align: middle;">N/A</td>
           <td class="text-danger"><span class="glyphicon glyphicon-remove"></span> <span class="sr-only">Not Supported</span></td>
           <td class="text-muted">N/A</td>
-- 
cgit v1.2.3


From d6104b11511a69fb48d1e438141f135a14c04122 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
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/getting-started')

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 @@
 <!-- Latest compiled and minified CSS -->
 <link rel="stylesheet" href="{{ site.cdn.css }}">
 
+<!-- RTL (right-to-left) version of CSS -->
+<link rel="stylesheet" href="{{ site.cdn.css_rtl }}">
+
 <!-- Optional theme -->
 <link rel="stylesheet" href="{{ site.cdn.css_theme }}">
 
-- 
cgit v1.2.3


From 04028cf6feb62471a3788cd15804e62b9ce890d7 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
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/getting-started')

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 f0daa64a29a66a663f6fedb9d8687524af754436 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Wed, 7 May 2014 15:30:27 -0700
Subject: move rtl to getting started, per @cvrebert's feedback

---
 docs/_includes/getting-started/rtl.html | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 docs/_includes/getting-started/rtl.html

(limited to 'docs/_includes/getting-started')

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 @@
+<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>
-- 
cgit v1.2.3


From 5d8880fdfae7de50d867eb9695b704f50ab77775 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
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 +++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 docs/_includes/getting-started/grunt.html

(limited to 'docs/_includes/getting-started')

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 @@
+<div class="bs-docs-section">
+  <h1 id="grunt" class="page-header">Compiling CSS and JavaScript</h1>
+
+  <p class="lead">Bootstrap uses <a href="http://gruntjs.com">Grunt</a> for its build system, with convenient methods for working with the framework. It's how we compile our code, run tests, and more.</p>
+
+  <h2 id="grunt-installing">Installing Grunt</h2>
+  <p>To install Grunt, you must <strong>first <a href="http://nodejs.org/download/">download and install node.js</a></strong> (which includes npm). npm stands for <a href="http://npmjs.org/">node packaged modules</a> and is a way to manage development dependencies through node.js.</p>
+
+  Then, from the command line:
+  <ol>
+    <li>Install <code>grunt-cli</code> globally with <code>npm install -g grunt-cli</code>.</li>
+    <li>Navigate to the root <code>/bootstrap/</code> directory, then run <code>npm install</code>. npm will look at the <a href="https://github.com/twbs/bootstrap/blob/master/package.json"><code>package.json</code></a> file and automatically install the necessary local dependencies listed there.</li>
+  </ol>
+
+  <p>When completed, you'll be able to run the various Grunt commands provided from the command line.</p>
+
+  <h2 id="grunt-commands">Available Grunt commands</h2>
+  <h3><code>grunt dist</code> (Just compile CSS and JavaScript)</h3>
+  <p>Regenerates the <code>/dist/</code> directory with compiled and minified CSS and JavaScript files. As a Bootstrap user, this is normally the command you want.</p>
+
+  <h3><code>grunt watch</code> (Watch)</h3>
+  <p>Watches the Less source files and automatically recompiles them to CSS whenever you save a change.</p>
+
+  <h3><code>grunt test</code> (Run tests)</h3>
+  <p>Runs <a href="http://jshint.com">JSHint</a> and runs the <a href="http://qunitjs.com">QUnit</a> tests headlessly in <a href="http://phantomjs.org">PhantomJS</a>.</p>
+
+  <h3><code>grunt</code> (Build absolutely everything and run tests)</h3>
+  <p>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.</p>
+
+  <h2 id="grunt-troubleshooting">Troubleshooting</h2>
+  <p>Should you encounter problems with installing dependencies or running Grunt commands, first delete the <code>/node_modules/</code> directory generated by npm. Then, rerun <code>npm install</code>.</p>
+</div>
-- 
cgit v1.2.3


From ed98b3dfc012166d01c72fc80caa0113e37b4d45 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Sat, 10 May 2014 09:22:43 +0300
Subject: Update html5shiv to 3.7.2.

---
 docs/_includes/getting-started/template.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

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>
-- 
cgit v1.2.3


From be00b82bb95c6defc02a66f2d599fec56fbcaa85 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Mon, 12 May 2014 19:55:58 -0700
Subject: nuke the rtl docs

---
 docs/_includes/getting-started/rtl.html | 25 -------------------------
 1 file changed, 25 deletions(-)
 delete mode 100644 docs/_includes/getting-started/rtl.html

(limited to 'docs/_includes/getting-started')

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>
-- 
cgit v1.2.3


From 7a765d1f8b45dd10d40e6c9ac5ad144ff95a9b0d Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Tue, 13 May 2014 08:33:23 +0300
Subject: Update jQuery to v1.11.1.

---
 docs/_includes/getting-started/template.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

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 @@
     <h1>Hello, world!</h1>
 
     <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
     <!-- Include all compiled plugins (below), or include individual files as needed -->
     <script src="js/bootstrap.min.js"></script>
   </body>
-- 
cgit v1.2.3


From d0fca8aaad4999d3389ebdada36102c89063e0f2 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
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/getting-started')

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 @@
 <!-- Latest compiled and minified CSS -->
 <link rel="stylesheet" href="{{ site.cdn.css }}">
 
-<!-- RTL (right-to-left) version of CSS -->
-<link rel="stylesheet" href="{{ site.cdn.css_rtl }}">
-
 <!-- Optional theme -->
 <link rel="stylesheet" href="{{ site.cdn.css_theme }}">
 
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 <github@rebertia.com>
Date: Tue, 13 May 2014 04:19:51 -0700
Subject: add link to StackOverflow question regarding Android <select> bug

---
 docs/_includes/getting-started/browser-device-support.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html
index a799bbb96..1a1236440 100644
--- a/docs/_includes/getting-started/browser-device-support.html
+++ b/docs/_includes/getting-started/browser-device-support.html
@@ -173,7 +173,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
   <h3 id="support-android-stock-browser">Android stock browser</h3>
   <p>Out of the box, Android 4.1 (and even some newer releases apparently) ship with the Browser app as the default web browser of choice (as opposed to Chrome). Unfortunately, the Browser app has lots of bugs and inconsistencies with CSS in general.</p>
   <h4>Select menus</h4>
-  <p>On <code>&lt;select&gt;</code> elements, the Android stock browser will not display the side controls if there is a <code>border-radius</code> and/or <code>border</code> applied. Use the snippet of code below to remove the offending CSS and render the <code>&lt;select&gt;</code> as an unstyled element on the Android stock browser. The user agent sniffing avoids interference with Chrome, Safari, and Mozilla browsers.</p>
+  <p>On <code>&lt;select&gt;</code> elements, the Android stock browser will not display the side controls if there is a <code>border-radius</code> and/or <code>border</code> applied. (See <a href="http://stackoverflow.com/questions/14744437/html-select-box-not-showing-drop-down-arrow-on-android-version-4-0-when-set-with">this StackOverflow question</a> for details.) Use the snippet of code below to remove the offending CSS and render the <code>&lt;select&gt;</code> as an unstyled element on the Android stock browser. The user agent sniffing avoids interference with Chrome, Safari, and Mozilla browsers.</p>
 {% highlight html %}
 <script>
 $(function () {
-- 
cgit v1.2.3


From 511240b37751f10fc5043c8155f9f097c8bdcb09 Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Sat, 17 May 2014 22:55:29 -0700
Subject: update link to Grunt setup & info

---
 docs/_includes/getting-started/download.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html
index c89c8b9e4..bb0537796 100644
--- a/docs/_includes/getting-started/download.html
+++ b/docs/_includes/getting-started/download.html
@@ -13,7 +13,7 @@
     </div>
     <div class="col-sm-4">
       <h3 id="download-source">Source code</h3>
-      <p>Source Less, JavaScript, and font files, along with our docs. <strong>Requires a Less compiler and <a href="{{ site.repo }}#compiling-css-and-javascript">some setup.</a></strong></p>
+      <p>Source Less, JavaScript, and font files, along with our docs. <strong>Requires a Less compiler and <a href="#grunt">some setup.</a></strong></p>
       <p>
         <a href="{{ site.download.source }}" class="btn btn-lg btn-outline" role="button" onclick="ga('send', 'event', 'Getting started', 'Download', 'Download source');">Download source</a>
       </p>
-- 
cgit v1.2.3


From d75506fbec6a50d13802a46b6a1e1fe6bd8655e6 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Wed, 18 Jun 2014 15:12:15 -0700
Subject: among supported WebKit/Blink browsers, this now only applies to
 Safari

Missed this in 4cbc8d49b10f707029019aaa5eba50e56390a3c5
---
 docs/_includes/getting-started/examples.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/examples.html b/docs/_includes/getting-started/examples.html
index bf87a2cec..49729f53e 100644
--- a/docs/_includes/getting-started/examples.html
+++ b/docs/_includes/getting-started/examples.html
@@ -119,7 +119,7 @@
         <img src="../examples/screenshots/justified-nav.jpg" alt="">
       </a>
       <h4>Justified nav</h4>
-      <p>Create a custom navbar with justified links. Heads up! <a href="../components/#nav-justified">Not too WebKit friendly.</a></p>
+      <p>Create a custom navbar with justified links. Heads up! <a href="../components/#nav-justified">Not too Safari friendly.</a></p>
     </div>
     <div class="clearfix visible-xs"></div>
 
-- 
cgit v1.2.3


From bd541083f14f8293bc327255c17da4f376443d02 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
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/getting-started')

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 @@
       <h4>Offcanvas</h4>
       <p>Build a toggleable off-canvas navigation menu for use with Bootstrap.</p>
     </div>
-    <div class="col-xs-6 col-md-4">
-      <a class="thumbnail" href="../examples/equal-height-columns/">
-        <img src="../examples/screenshots/equal-height-columns.jpg" alt="">
-      </a>
-      <h4>Equal-height grid columns</h4>
-      <p>Adds automatic equal-height grid columns to Bootstrap's grid system.</p>
-    </div>
   </div>
 </div>
-- 
cgit v1.2.3


From 8c1160d91bf0a7599a1b519592829dfb396fd847 Mon Sep 17 00:00:00 2001
From: Bas Bosman <github@nazgul.nu>
Date: Thu, 19 Jun 2014 11:26:55 +0200
Subject: Document IE8 font-face weirdness

---
 docs/_includes/getting-started/browser-device-support.html | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'docs/_includes/getting-started')

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 @@
   <h3 id="support-ie8-box-sizing">Internet Explorer 8 and box-sizing</h3>
   <p>IE8 does not fully support <code>box-sizing: border-box;</code> when combined with <code>min-width</code>, <code>max-width</code>, <code>min-height</code>, or <code>max-height</code>. For that reason, as of v3.0.1, we no longer use <code>max-width</code> on <code>.container</code>s.</p>
 
+  <h3 id="support-ie8-font-face">Internet Explorer 8 and @font-face</h3>
+  <p>IE8 has some issues with <code>@font-face</code> when combined with <code>:before</code>. 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. <a href="https://github.com/twbs/bootstrap/issues/13863">See issue #13863</a> for details.</p>
+
   <h3 id="support-ie-compatibility-modes">IE Compatibility modes</h3>
   <p>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 <code>&lt;meta&gt;</code> tag in your pages:</p>
 {% highlight html %}
-- 
cgit v1.2.3


From 7339759fd6e11473a633f55f53a0b4ced6a7fa7d Mon Sep 17 00:00:00 2001
From: Julian Thilo <bigj95t@gmail.com>
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/getting-started')

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 @@
 <div class="bs-docs-section">
   <h1 id="examples" class="page-header">Examples</h1>
 
-  <p class="lead">Build on the basic template above with Bootstrap's many components. See also <a href="#customizing">Customizing Bootstrap</a> for tips on maintaining your own Bootstrap variants.</p>
+  <p class="lead">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.</p>
 
   <h3 id="examples-framework">Using the framework</h3>
   <div class="row bs-examples">
-- 
cgit v1.2.3


From afbe7114b4a362b6cae008328343d9e568c03457 Mon Sep 17 00:00:00 2001
From: Chris Rebert <github@rebertia.com>
Date: Wed, 2 Jul 2014 17:09:13 -0700
Subject: clarify the iOS virtual keyboard bug with respect to navbars

---
 docs/_includes/getting-started/browser-device-support.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/_includes/getting-started')

diff --git a/docs/_includes/getting-started/browser-device-support.html b/docs/_includes/getting-started/browser-device-support.html
index 4140a9c22..0c7c1a4a9 100644
--- a/docs/_includes/getting-started/browser-device-support.html
+++ b/docs/_includes/getting-started/browser-device-support.html
@@ -158,7 +158,7 @@ if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
   <h4>Overflow and scrolling</h4>
   <p>Support for <code>overflow: hidden</code> on the <code>&lt;body&gt;</code> element is quite limited in iOS and Android. To that end, when you scroll past the top or bottom of a modal in either of those devices' browsers, the <code>&lt;body&gt;</code> content will begin to scroll.</p>
   <h4>Virtual keyboards</h4>
-  <p>Also, note that if you're using inputs in your modal or navbar, iOS has a rendering bug that doesn't update the position of fixed elements when the virtual keyboard is triggered. A few workarounds for this include transforming your elements to <code>position: absolute</code> or invoking a timer on focus to try to correct the positioning manually. This is not handled by Bootstrap, so it is up to you to decide which solution is best for your application.</p>
+  <p>Also, note that if you're using a fixed navbar or using inputs within a modal, iOS has a rendering bug that doesn't update the position of fixed elements when the virtual keyboard is triggered. A few workarounds for this include transforming your elements to <code>position: absolute</code> or invoking a timer on focus to try to correct the positioning manually. This is not handled by Bootstrap, so it is up to you to decide which solution is best for your application.</p>
   <h4>Navbar Dropdowns</h4>
   <p>The <code>.dropdown-backdrop</code> element isn't used on iOS in the nav because of the complexity of z-indexing. Thus, to close dropdowns in navbars, you must directly click the dropdown element (or any other element which will fire a click event in iOS).</p>
 
-- 
cgit v1.2.3