From 595e1a189c1911ada7c4bd4c769c28b1741611ac Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 13 Sep 2012 10:07:57 -0700 Subject: fixes #5119: javascript in navbar typo --- docs/base-css.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 7504f2469..d8fcc6ea5 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -58,7 +58,7 @@ Components
  • - Javascript + JavaScript
  • Customize -- cgit v1.2.3 From caa79ed594daae704793a08e94a6e2d9da32eaf1 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 17 Sep 2012 16:26:51 -0700 Subject: fixes #5001: proper ids on form examples --- docs/base-css.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index d8fcc6ea5..653f5b7b1 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1402,9 +1402,9 @@ For example, <code><section></code> should be wrapped as inlin
    - +
    - + Username is taken
    -- cgit v1.2.3 From 532ee082135eec9ba510d8f085add8722da5a03b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Thu, 20 Sep 2012 11:37:34 -0700 Subject: fixes #5150: add btn-group support to input groups --- docs/base-css.html | 142 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 131 insertions(+), 11 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 653f5b7b1..d3a92c831 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1131,20 +1131,22 @@ For example, <code><section></code> should be wrapped as inlin
    @ - +

    - + .00 
     <div class="input-prepend">
-  <span class="add-on">@</span><input class="span2" id="prependedInput" size="16" type="text" placeholder="Username">
+  <span class="add-on">@</span>
+  <input class="span2" id="prependedInput" type="text" placeholder="Username">
 </div>
 <div class="input-append">
-  <input class="span2" id="appendedInput" size="16" type="text"><span class="add-on">.00</span>
+  <input class="span2" id="appendedInput" type="text">
+  <span class="add-on">.00</span>
 </div>
    @@ -1153,13 +1155,15 @@ For example, <code><section></code> should be wrapped as inlin
    $ - + .00 
     <div class="input-prepend input-append">
-  <span class="add-on">$</span><input class="span2" id="appendedPrependedInput" size="16" type="text"><span class="add-on">.00</span>
+  <span class="add-on">$</span>
+  <input class="span2" id="appendedPrependedInput" type="text">
+  <span class="add-on">.00</span>
 </div>
    @@ -1167,23 +1171,139 @@ For example, <code><section></code> should be wrapped as inlin

    Instead of a <span> with text, use a .btn to attach a button (or two) to an input.

    - +
    -
    +
    +
    +<div class="input-append">
+  <input class="span2" id="appendedInputButton" type="text">
+  <button class="btn" type="button">Go!</button>
+</div>
+
    +
    - + 
     <div class="input-append">
-  <input class="span2" id="appendedInputButton" size="16" type="text"><button class="btn" type="button">Go!</button>
+  <input class="span2" id="appendedInputButtons" type="text">
+  <button class="btn" type="button">Search</button>
+  <button class="btn" type="button">Options</button>
 </div>
+
    +

    Button dropdowns

    +

    +
    +
    + +
    + + +
    +
    +
    +
     <div class="input-append">
-  <input class="span2" id="appendedInputButtons" size="16" type="text"><button class="btn" type="button">Search</button><button class="btn" type="button">Options</button>
+  <input class="span2" id="appendedDropdownButton" type="text">
+  <div class="btn-group">
+    <button class="btn dropdown-toggle" data-toggle="dropdown">
+      Action
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu">
+      ...
+    </ul>
+  </div>
+</div>
+
    + +
    +
    +
    + + +
    + +
    +
    +
    +<div class="input-prepend">
+  <div class="btn-group">
+    <button class="btn dropdown-toggle" data-toggle="dropdown">
+      Action
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu">
+      ...
+    </ul>
+  </div>
+  <input class="span2" id="prependedDropdownButton" type="text">
+</div>
+
    + +
    +
    +
    + + +
    + +
    + + +
    +
    +
    +
    +<div class="input-prepend input-append">
+  <div class="btn-group">
+    <button class="btn dropdown-toggle" data-toggle="dropdown">
+      Action
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu">
+      ...
+    </ul>
+  </div>
+  <input class="span2" id="appendedPrependedDropdownButton" type="text">
+  <div class="btn-group">
+    <button class="btn dropdown-toggle" data-toggle="dropdown">
+      Action
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu">
+      ...
+    </ul>
+  </div>
 </div>
    -- cgit v1.2.3