From 3ecf1098357618092280b2e7c562a1ef5bf11959 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sat, 7 Apr 2012 16:44:03 -0700
Subject: fix conflicts, add docs example for two buttons on an append

---
 docs/base-css.html | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'docs/base-css.html')

diff --git a/docs/base-css.html b/docs/base-css.html
index 647b396c6..05ef04b7e 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -1223,6 +1223,14 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
               </div>
             </div>
           </div>
+          <div class="control-group">
+            <label class="control-label" for="appendedPrependedInput">Append with two buttons</label>
+            <div class="controls">
+              <div class="input-append">
+                <input class="span2" id="appendedPrependedInput" size="16" type="text"><button class="btn" type="button">Search</button><button class="btn" type="button">Options</button>
+              </div>
+            </div>
+          </div>
           <div class="control-group">
             <label class="control-label" for="inlineCheckboxes">Inline checkboxes</label>
             <div class="controls">
-- 
cgit v1.2.3