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 From f8374a754d2ffe153ab14cb1315365c1303c6bbe Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 28 Sep 2012 15:01:12 -0700 Subject: clean up emphasis docs text --- 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 d3a92c831..ddd585205 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -155,14 +155,14 @@

    Bold

    -

    For emphasizing a snippet of text with important

    +

    For emphasizing a snippet of text with a heavier font-weight.

    The following snippet of text is rendered as bold text.

    <strong>rendered as bold text</strong>

    Italics

    -

    For emphasizing a snippet of text with stress

    +

    For emphasizing a snippet of text with italics.

    The following snippet of text is rendered as italicized text.

    -- cgit v1.2.3 From 57f8dbe25cd073bbf4d28a52cd82a2554ab024fc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 30 Sep 2012 21:26:43 -0700 Subject: fixes #5360: typo in tables docs --- 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 ddd585205..1f0a039f0 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -509,7 +509,7 @@ For example, <code><section></code> should be wrapped as inlin

    Optional classes

    -

    Add any of the follow classes to the .table base class.

    +

    Add any of the following classes to the .table base class.

    .table-striped

    Adds zebra-striping to any table row within the <tbody> via the :nth-child CSS selector (not available in IE7-IE8).

    -- cgit v1.2.3 From 085d6d185d7695d0816315aeee5e3a8ed3c60585 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 1 Oct 2012 10:42:45 -0700 Subject: fixes #5055: wrap legend and form elements in fieldset so IE8 styles the legend properly --- docs/base-css.html | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 1f0a039f0..46ce606cb 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -875,25 +875,29 @@ For example, <code><section></code> should be wrapped as inlin

    Default styles

    Individual form controls receive styling, but without any required base class on the <form> or large changes in markup. Results in stacked, left-aligned labels on top of form controls.

    - Legend - - - Example block-level help text here. - - +
    + Legend + + + Example block-level help text here. + + + 
     <form>
-  <legend>Legend</legend>
-  <label>Label name</label>
-  <input type="text" placeholder="Type something…">
-  <span class="help-block">Example block-level help text here.</span>
-  <label class="checkbox">
-    <input type="checkbox"> Check me out
-  </label>
-  <button type="submit" class="btn">Submit</button>
+  <fieldset>
+    <legend>Legend</legend>
+    <label>Label name</label>
+    <input type="text" placeholder="Type something…">
+    <span class="help-block">Example block-level help text here.</span>
+    <label class="checkbox">
+      <input type="checkbox"> Check me out
+    </label>
+    <button type="submit" class="btn">Submit</button>
+  </fieldset>
 </form>
    @@ -947,7 +951,6 @@ For example, <code><section></code> should be wrapped as inlin
  • Wrap any associated controls in .controls for proper alignment
    • - Legend
    -- cgit v1.2.3 From e73cd15fc8eaa80ab7913d51a23a8e61c0e1bb30 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 2 Oct 2012 17:01:18 -0700 Subject: copy and style changes to improve docs rendering on mobile devices --- docs/base-css.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'docs/base-css.html') diff --git a/docs/base-css.html b/docs/base-css.html index 46ce606cb..23e073d6a 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -2063,12 +2063,14 @@ For example, <code><section></code> should be wrapped as inlin