aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-05 10:01:42 -0800
committerMark Otto <[email protected]>2012-01-05 10:01:42 -0800
commit20add59de3f2b69aaa9c9b325dab20b13c75eaa1 (patch)
tree862ec093fda66cf9cbed16ee746d3766e7112539 /docs
parentbdc22e71c8cbeddb1dbee9708ab68b4f23abb6f4 (diff)
downloadbootstrap-20add59de3f2b69aaa9c9b325dab20b13c75eaa1.tar.xz
bootstrap-20add59de3f2b69aaa9c9b325dab20b13c75eaa1.zip
breaking out patterns.less even more, removing unnecessary div from checkbox and radio lists--now just labels and inputs
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/docs.css2
-rw-r--r--docs/base-css.html72
-rw-r--r--docs/components.html46
3 files changed, 60 insertions, 60 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index b218b465c..a4573448f 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -171,7 +171,7 @@ body > .navbar-fixed .brand:hover {
font-weight: 300;
}
.marketing h2 {
- margin-bottom: 9px;
+ font-size: 22px;
}
.marketing p {
margin-right: 10px;
diff --git a/docs/base-css.html b/docs/base-css.html
index 37fa97ba8..58d42c2b0 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -973,40 +973,36 @@ Form states
<fieldset class="control-group">
<label class="control-label" for="optionsCheckboxes">Checkboxes</label>
<div class="controls">
- <div class="control-list">
- <label class="checkbox">
- <input type="checkbox" name="optionsCheckboxes" value="option1">
- Option one is this and that&mdash;be sure to include why it’s great
- </label>
- <label class="checkbox">
- <input type="checkbox" name="optionsCheckboxes" value="option2">
- Option two can also be checked and included in form results
- </label>
- <label class="checkbox">
- <input type="checkbox" name="optionsCheckboxes" value="option3">
- Option three can&mdash;yes, you guessed it&mdash;also be checked and included in form results
- </label>
- <label class="checkbox">
- <input type="checkbox" name="optionsCheckboxes" value="option4">
- Option four cannot be checked as it is disabled
- </label>
- </div>
+ <label class="checkbox">
+ <input type="checkbox" name="optionsCheckboxes" value="option1">
+ Option one is this and that&mdash;be sure to include why it’s great
+ </label>
+ <label class="checkbox">
+ <input type="checkbox" name="optionsCheckboxes" value="option2">
+ Option two can also be checked and included in form results
+ </label>
+ <label class="checkbox">
+ <input type="checkbox" name="optionsCheckboxes" value="option3">
+ Option three can&mdash;yes, you guessed it&mdash;also be checked and included in form results
+ </label>
+ <label class="checkbox">
+ <input type="checkbox" name="optionsCheckboxes" value="option4">
+ Option four cannot be checked as it is disabled
+ </label>
<p class="help-text"><strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.</p>
</div>
</fieldset>
<fieldset class="control-group">
<label class="control-label" for="optionsRadios">Radio buttons</label>
<div class="controls">
- <div class="control-list">
- <label>
- <input type="radio" checked name="optionsRadios" value="option1">
- <span>Option one is this and that&mdash;be sure to include why it’s great</span>
- </label>
- <label>
- <input type="radio" name="optionsRadios" value="option2">
- <span>Option two can is something else and selecting it will deselect options 1</span>
- </label>
- </div>
+ <label class="radio">
+ <input type="radio" checked name="optionsRadios" value="option1">
+ Option one is this and that&mdash;be sure to include why it’s great
+ </label>
+ <label class="radio">
+ <input type="radio" name="optionsRadios" value="option2">
+ Option two can is something else and selecting it will deselect options 1
+ </label>
<p class="help-text"><strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.</p>
</div>
</fieldset>
@@ -1040,17 +1036,15 @@ Form states
<fieldset class="control-group">
<label class="control-label" for="input02">Label</label>
<div class="controls">
- <div class="control-list">
- <label class="checkbox">
- <input type="checkbox"> Something something something something something
- </label>
- <label class="checkbox">
- <input type="checkbox"> Something something something something
- </label>
- <label class="checkbox">
- <input type="checkbox"> Something something something
- </label>
- </div>
+ <label class="checkbox">
+ <input type="checkbox"> Something something something something something
+ </label>
+ <label class="checkbox">
+ <input type="checkbox"> Something something something something
+ </label>
+ <label class="checkbox">
+ <input type="checkbox"> Something something something
+ </label>
</div>
</fieldset>
<fieldset class="form-actions">
diff --git a/docs/components.html b/docs/components.html
index d9d6b10d6..e57d1fd17 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -230,27 +230,33 @@
<h1>Side nav <small></small></h1>
</div>
- <div class="well side-nav">
- <h6 class="nav-label">Your account</h6>
- <ul class="nav-group">
- <li class="active"><a class="nav-item" href="#">Home</a></li>
- <li><a class="nav-item" href="#">Library</a></li>
- <li><a class="nav-item" href="#">Profile</a></li>
- <li><a class="nav-item" href="#">Settings</a></li>
- <li><a class="nav-item" href="#">Help</a></li>
- </ul>
- </div>
-
- <div class="well side-nav">
- <h6 class="nav-label">Your account</h6>
- <ul class="nav-group">
- <li class="active"><a class="nav-item" href="#"><i class="home"></i> Home</a></li>
- <li><a class="nav-item" href="#"><i class="book"></i> Library</a></li>
- <li><a class="nav-item" href="#"><i class="user"></i> Profile</a></li>
- <li><a class="nav-item" href="#"><i class="cog"></i> Settings</a></li>
- <li><a class="nav-item" href="#"><i class="time"></i> Help</a></li>
- </ul>
+ <div class="row">
+ <div class="span3">
+ <div class="well side-nav">
+ <h6 class="nav-label">Your account</h6>
+ <ul class="nav-group">
+ <li class="active"><a class="nav-item" href="#">Home</a></li>
+ <li><a class="nav-item" href="#">Library</a></li>
+ <li><a class="nav-item" href="#">Profile</a></li>
+ <li><a class="nav-item" href="#">Settings</a></li>
+ <li><a class="nav-item" href="#">Help</a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="span3">
+ <div class="well side-nav">
+ <h6 class="nav-label">Your account</h6>
+ <ul class="nav-group">
+ <li class="active"><a class="nav-item" href="#"><i class="home"></i> Home</a></li>
+ <li><a class="nav-item" href="#"><i class="book"></i> Library</a></li>
+ <li><a class="nav-item" href="#"><i class="user"></i> Profile</a></li>
+ <li><a class="nav-item" href="#"><i class="cog"></i> Settings</a></li>
+ <li><a class="nav-item" href="#"><i class="time"></i> Help</a></li>
+ </ul>
+ </div>
+ </div>
</div>
+
</section>