Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <otto@github.com>2012-12-10 10:13:40 +0400
committerMark Otto <otto@github.com>2012-12-10 10:13:40 +0400
commit4245e8ebb5c98ca1a89b7b56578d4fe52ee81802 (patch)
tree43da0a377deac5fecf68d9e39e91ebc135d02178 /docs
parent6e9bbe6232217fb86e10d0f7623863cf1a1aa135 (diff)
Fix checkbox and radios example
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap.css1
-rw-r--r--docs/css.html60
-rw-r--r--docs/templates/pages/css.mustache60
3 files changed, 73 insertions, 48 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d4495a2704..f443e17b7c 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -903,6 +903,7 @@ textarea::-webkit-input-placeholder {
.radio label,
.checkbox label {
+ margin-bottom: 0;
font-weight: normal;
}
diff --git a/docs/css.html b/docs/css.html
index d7852ed2cb..87c8d4f856 100644
--- a/docs/css.html
+++ b/docs/css.html
@@ -1185,34 +1185,46 @@ For example, &lt;code&gt;&lt;section&gt;&lt;/code&gt; should be wrapped as inlin
<p>Checkboxes are for selecting one or several options in a list while radios are for selecting one option from many.</p>
<h4>Default (stacked)</h4>
<form class="bs-docs-example">
- <label class="checkbox">
- <input type="checkbox" value="">
- Option one is this and that&mdash;be sure to include why it's great
- </label>
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" value="">
+ Option one is this and that&mdash;be sure to include why it's great
+ </label>
+ </div>
<br>
- <label class="radio">
- <input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
- Option one is this and that&mdash;be sure to include why it's great
- </label>
- <label class="radio">
- <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
- Option two can be something else and selecting it will deselect option one
- </label>
+ <div class="radio">
+ <label>
+ <input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
+ Option one is this and that&mdash;be sure to include why it's great
+ </label>
+ </div>
+ <div class="radio">
+ <label>
+ <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
+ Option two can be something else and selecting it will deselect option one
+ </label>
+ </div>
</form>
<pre class="prettyprint linenums">
-&lt;label class="checkbox"&gt;
- &lt;input type="checkbox" value=""&gt;
- Option one is this and that&mdash;be sure to include why it's great
-&lt;/label&gt;
+&lt;div class="checkbox"&gt;
+ &lt;label&gt;
+ &lt;input type="checkbox" value=""&gt;
+ Option one is this and that&mdash;be sure to include why it's great
+ &lt;/label&gt;
+&lt;/div&gt;
-&lt;label class="radio"&gt;
- &lt;input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked&gt;
- Option one is this and that&mdash;be sure to include why it's great
-&lt;/label&gt;
-&lt;label class="radio"&gt;
- &lt;input type="radio" name="optionsRadios" id="optionsRadios2" value="option2"&gt;
- Option two can be something else and selecting it will deselect option one
-&lt;/label&gt;
+&lt;div class="radio"&gt;
+ &lt;label&gt;
+ &lt;input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked&gt;
+ Option one is this and that&mdash;be sure to include why it's great
+ &lt;/label&gt;
+&lt;/div&gt;
+&lt;div class="radio"&gt;
+ &lt;label&gt;
+ &lt;input type="radio" name="optionsRadios" id="optionsRadios2" value="option2"&gt;
+ Option two can be something else and selecting it will deselect option one
+ &lt;/label&gt;
+&lt;/div&gt;
</pre>
<h4>Inline checkboxes</h4>
diff --git a/docs/templates/pages/css.mustache b/docs/templates/pages/css.mustache
index f72d3b8abe..73ab657a9f 100644
--- a/docs/templates/pages/css.mustache
+++ b/docs/templates/pages/css.mustache
@@ -1125,34 +1125,46 @@ For example, &lt;code&gt;&lt;section&gt;&lt;/code&gt; should be wrapped as inlin
<p>Checkboxes are for selecting one or several options in a list while radios are for selecting one option from many.</p>
<h4>Default (stacked)</h4>
<form class="bs-docs-example">
- <label class="checkbox">
- <input type="checkbox" value="">
- Option one is this and that&mdash;be sure to include why it's great
- </label>
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" value="">
+ Option one is this and that&mdash;be sure to include why it's great
+ </label>
+ </div>
<br>
- <label class="radio">
- <input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
- Option one is this and that&mdash;be sure to include why it's great
- </label>
- <label class="radio">
- <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
- Option two can be something else and selecting it will deselect option one
- </label>
+ <div class="radio">
+ <label>
+ <input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked>
+ Option one is this and that&mdash;be sure to include why it's great
+ </label>
+ </div>
+ <div class="radio">
+ <label>
+ <input type="radio" name="optionsRadios" id="optionsRadios2" value="option2">
+ Option two can be something else and selecting it will deselect option one
+ </label>
+ </div>
</form>
<pre class="prettyprint linenums">
-&lt;label class="checkbox"&gt;
- &lt;input type="checkbox" value=""&gt;
- Option one is this and that&mdash;be sure to include why it's great
-&lt;/label&gt;
+&lt;div class="checkbox"&gt;
+ &lt;label&gt;
+ &lt;input type="checkbox" value=""&gt;
+ Option one is this and that&mdash;be sure to include why it's great
+ &lt;/label&gt;
+&lt;/div&gt;
-&lt;label class="radio"&gt;
- &lt;input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked&gt;
- Option one is this and that&mdash;be sure to include why it's great
-&lt;/label&gt;
-&lt;label class="radio"&gt;
- &lt;input type="radio" name="optionsRadios" id="optionsRadios2" value="option2"&gt;
- Option two can be something else and selecting it will deselect option one
-&lt;/label&gt;
+&lt;div class="radio"&gt;
+ &lt;label&gt;
+ &lt;input type="radio" name="optionsRadios" id="optionsRadios1" value="option1" checked&gt;
+ Option one is this and that&mdash;be sure to include why it's great
+ &lt;/label&gt;
+&lt;/div&gt;
+&lt;div class="radio"&gt;
+ &lt;label&gt;
+ &lt;input type="radio" name="optionsRadios" id="optionsRadios2" value="option2"&gt;
+ Option two can be something else and selecting it will deselect option one
+ &lt;/label&gt;
+&lt;/div&gt;
</pre>
<h4>Inline checkboxes</h4>