aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes/getting-started
diff options
context:
space:
mode:
Diffstat (limited to 'docs/_includes/getting-started')
-rw-r--r--docs/_includes/getting-started/browser-device-support.html2
-rw-r--r--docs/_includes/getting-started/download.html5
-rw-r--r--docs/_includes/getting-started/grunt.html32
-rw-r--r--docs/_includes/getting-started/rtl.html25
-rw-r--r--docs/_includes/getting-started/template.html4
-rw-r--r--docs/_includes/getting-started/whats-included.html2
6 files changed, 36 insertions, 34 deletions
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 () {
diff --git a/docs/_includes/getting-started/download.html b/docs/_includes/getting-started/download.html
index b457d038e..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>
@@ -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/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>
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..3952621a6 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>
@@ -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>
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/