aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2011-09-10 13:17:43 -0700
committerJacob Thornton <[email protected]>2011-09-10 13:17:43 -0700
commit5bc455d3707b87960d32c0672f5afb3b31173ec8 (patch)
tree037db3b6517d9630962abddf2a811ba9a97d957c
parent1041977d0acedfcbd0d2a0d4a007496ccad10991 (diff)
parentc797cb61a6a36459b0c3e7b628e22ad3518350e8 (diff)
downloadbootstrap-5bc455d3707b87960d32c0672f5afb3b31173ec8.tar.xz
bootstrap-5bc455d3707b87960d32c0672f5afb3b31173ec8.zip
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
-rw-r--r--bootstrap-1.3.0.css4
-rw-r--r--bootstrap-1.3.0.min.css2
-rw-r--r--docs/index.html4
-rw-r--r--lib/forms.less2
4 files changed, 6 insertions, 6 deletions
diff --git a/bootstrap-1.3.0.css b/bootstrap-1.3.0.css
index f42e314a2..9eef0b12a 100644
--- a/bootstrap-1.3.0.css
+++ b/bootstrap-1.3.0.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Fri Sep 9 22:48:53 PDT 2011
+ * Date: Sat Sep 10 13:04:12 PDT 2011
*/
/* Reset.less
* Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -702,7 +702,7 @@ label {
text-align: right;
color: #404040;
}
-div.input {
+form .input {
margin-left: 150px;
}
input[type=checkbox], input[type=radio] {
diff --git a/bootstrap-1.3.0.min.css b/bootstrap-1.3.0.min.css
index de1d659b3..d16ecebb6 100644
--- a/bootstrap-1.3.0.min.css
+++ b/bootstrap-1.3.0.min.css
@@ -115,7 +115,7 @@ fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;padd
form .clearfix{margin-bottom:18px;}
label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
-div.input{margin-left:150px;}
+form .input{margin-left:150px;}
input[type=checkbox],input[type=radio]{cursor:pointer;}
input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;}
diff --git a/docs/index.html b/docs/index.html
index d8febe0a4..42c548ea3 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -455,7 +455,7 @@
</p>
</div>
<div class="span12">
- <h4>When to use</h4>
+ <h3>When to use</h3>
<p>Emphasis tags (<code>&lt;strong&gt;</code> and <code>&lt;em&gt;</code>) should be used to indicate additional importance or emphasis of a word or phrase relative to its surrounding copy. Use <code>&lt;strong&gt;</code> for importance and <code>&lt;em&gt;</code> for <em>stress</em> emphasis.</p>
<h3>Emphasis in a paragraph</h3>
<p><a href="#">Fusce dapibus</a>, <strong>tellus ac cursus commodo</strong>, <em>tortor mauris condimentum nibh</em>, ut fermentum massa justo sit amet risus. Maecenas faucibus mollis interdum. Nulla vitae elit libero, a pharetra augue.</p>
@@ -497,7 +497,7 @@
</p>
</div>
<div class="span12">
- <h4>How to quote</h4>
+ <h3>How to quote</h3>
<p>To include a blockquote, wrap <code>&lt;blockquote&gt;</code> around <code>&lt;p&gt;</code> and <code>&lt;small&gt;</code> tags. Use the <code>&lt;small&gt;</code> element to cite your source and you'll get an em dash <code>&amp;mdash;</code> before it.</p>
<blockquote>
<p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer posuere erat a ante venenatis dapibus posuere velit aliquet.</p>
diff --git a/lib/forms.less b/lib/forms.less
index 3e52875eb..2ac43177e 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -50,7 +50,7 @@ label {
}
// Shift over the inside div to align all label's relevant content
-div.input {
+form .input {
margin-left: 150px;
}