From: Mark Otto <otto@github.com>
Date: Sun, 13 Oct 2013 22:23:58 +0000 (-0700)
Subject: Document caret /cc #10102
X-Git-Tag: v3.0.1~39^2~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12fa502e67df45d27e151fd51b5a497489232626;p=thirdparty%2Fbootstrap.git

Document caret /cc #10102
---

diff --git a/_includes/nav-css.html b/_includes/nav-css.html
index ae5962c7c7..4ef5e4bca0 100644
--- a/_includes/nav-css.html
+++ b/_includes/nav-css.html
@@ -79,6 +79,7 @@
   <a href="#helper-classes">Helper classes</a>
   <ul class="nav">
     <li><a href="#helper-classes-close">Close icon</a></li>
+    <li><a href="#helper-classes-carets">Carets</a></li>
     <li><a href="#helper-classes-floats">Quick floats</a></li>
     <li><a href="#helper-classes-center">Center content blocks</a></li>
     <li><a href="#helper-classes-clearfix">Clearfix</a></li>
diff --git a/css.html b/css.html
index 69f1c4c503..d884c765e5 100644
--- a/css.html
+++ b/css.html
@@ -72,6 +72,13 @@ base_url: "../"
     </div>
     <p class="lead">Bootstrap includes a responsive, mobile first fluid grid system that appropriately scales up to 12 columns as the device or viewport size increases. It includes <a href="#grid-example-basic">predefined classes</a> for easy layout options, as well as powerful <a href="#grid-less">mixins for generating more semantic layouts</a>.</p>
 
+    <h3 id="grid-how-it-works">How it works</h3>
+    <p>Grid systems are great for building easy to use and maintain web pages. In the most basic implementation, you create rows of columns to house your content. Bootstrap's grid system enables this in two ways: predefined CSS classes and LESS mixins. In both cases, the following guidelines apply.</p>
+    <ul>
+      <li>Create a <code>.row</code> to house your columns. No content should be placed directly within a row, only in columns.</li>
+      <li>Each column is created by specifying the number of available grid columns you'd like to span. By default, we have 12 columns. For an even layout, you'd create two columns, each spanning six columns.</li>
+    </ul>
+
     <h3 id="grid-media-queries">Media queries</h3>
     <p>We use the following media queries in our LESS files to create the key breakpoints in our grid system.</p>
 {% highlight css %}
@@ -2258,6 +2265,16 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% endhighlight %}
 
 
+    <h3 id="helper-classes-carets">Carets</h3>
+    <p>Use carets to indicate dropdown functionality and direction. Note that the default caret will reverse automatically in <a href="../components/#btn-dropdowns-dropup">dropup menus</a>.</p>
+    <div class="bs-example">
+      <span class="caret"></span>
+    </div>
+{% highlight html %}
+<span class="caret"></span>
+{% endhighlight %}
+
+
     <h3 id="helper-classes-floats">Quick floats</h3>
     <p>Float an element to the left or right with a class. <code>!important</code> is included to avoid specificity issues. Classes can also be used as mixins.</p>
 {% highlight html %}