From: Mark Otto <markdotto@gmail.com>
Date: Sat, 28 Jan 2012 03:12:09 +0000 (-0800)
Subject: Merge branch '2.0/docs/base/icons' of https://github.com/buraktuyan/bootstrap into... 
X-Git-Tag: v2.0.0~6^2~106
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a624ac1edf7484dbdf7f4176d9d4485f1878f4e5;p=thirdparty%2Fbootstrap.git

Merge branch '2.0/docs/base/icons' of https://github.com/buraktuyan/bootstrap into buraktuyan-2.0/docs/base/icons
---

a624ac1edf7484dbdf7f4176d9d4485f1878f4e5
diff --cc docs/templates/pages/base-css.mustache
index 2108ddd054,92c925b37b..5b9cae472a
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@@ -1468,5 -1473,33 +1479,33 @@@
          </ul>
        </div> <!-- /well -->
      </div>
+     <div class="span4">
+       <form>
+         <p>{{_i}}Use them with prepended forms.{{_i}}</p>
+         <div class="control-group">
+           <label class="control-label" for="prependedInput">{{_i}}Your Email Address:{{/i}}</label>
+           <div class="controls">
+             <div class="input-prepend">
+               <span class="add-on"><i class="icon envelope"></i></span>
+               <input class="span32" id="iconInput" size="16" type="text">
+             </div>
+           </div>
+         </div>
+         <div class="control-group">
+           <label class="control-label" for="iconSelect">{{_i}}Your Location:{{/i}}</label>
+           <div class="controls">
+             <div class="input-prepend">
+               <span class="add-on"><i class="icon map-marker"></i></span>
+               <select id="iconSelect">
+                 <option>Istanbul</option>
+                 <option>London</option>
+                 <option>New York</option>
+                 <option>Tokyo</option>
+               </select>
+             </div>
+           </div>
+         </div>
+       </form>
+     </div>
    </div>
 -</section>
 +</section>