aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-10-03 23:50:14 -0700
committerMark Otto <[email protected]>2011-10-03 23:50:14 -0700
commit3c31d8a258bf56357aa139f8d900b3faeee333a3 (patch)
tree4f4382f4cb69f504fd319e6d676ffa9ed3af8b53
parent45c9b489eeaffd61429425c1c6b9b3e723bf0514 (diff)
downloadbootstrap-3c31d8a258bf56357aa139f8d900b3faeee333a3.tar.xz
bootstrap-3c31d8a258bf56357aa139f8d900b3faeee333a3.zip
more small changes to compiled css to try things out
-rw-r--r--bootstrap.css4
-rw-r--r--bootstrap.min.css2
-rw-r--r--examples/fluid.html4
-rw-r--r--lib/forms.less2
4 files changed, 4 insertions, 8 deletions
diff --git a/bootstrap.css b/bootstrap.css
index 9dc882c9b..dbd23da2d 100644
--- a/bootstrap.css
+++ b/bootstrap.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: Mon Oct 3 22:44:23 PDT 2011
+ * Date: Mon Oct 3 23:49:59 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).
@@ -612,7 +612,7 @@ textarea {
font-weight: normal;
line-height: normal;
}
-form label {
+label {
padding-top: 6px;
font-size: 13px;
line-height: 18px;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 18ef1134e..45f433294 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -109,7 +109,7 @@ fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;padd
form .clearfix{margin-bottom:18px;zoom:1;}form .clearfix:before,form .clearfix:after{display:table;content:"";zoom:1;*display:inline;}
form .clearfix:after{clear:both;}
label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
-form label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
+label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
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;}
diff --git a/examples/fluid.html b/examples/fluid.html
index eacb5c3d2..b8405cea1 100644
--- a/examples/fluid.html
+++ b/examples/fluid.html
@@ -75,7 +75,6 @@
<p>Vestibulum id ligula porta felis euismod semper. Integer posuere erat a ante venenatis dapibus posuere velit aliquet. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.</p>
<p><a class="btn primary large">Learn more &raquo;</a></p>
</div>
-
<!-- Example row of columns -->
<div class="row">
<div class="span6">
@@ -94,9 +93,7 @@
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
</div>
-
<hr>
-
<!-- Example row of columns -->
<div class="row">
<div class="span6">
@@ -115,7 +112,6 @@
<p><a class="btn" href="#">View details &raquo;</a></p>
</div>
</div>
-
<footer>
<p>&copy; Company 2011</p>
</footer>
diff --git a/lib/forms.less b/lib/forms.less
index 058d32832..7c9cc7c62 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -40,7 +40,7 @@ textarea {
}
// Float labels left
-form label {
+label {
padding-top: 6px;
font-size: @basefont;
line-height: @baseline;