aboutsummaryrefslogtreecommitdiff
path: root/bootstrap.css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-11-17 00:37:14 -0800
committerMark Otto <[email protected]>2011-11-17 00:37:14 -0800
commit160970560b819fe3e3a3396f7385ed8cafc43bf9 (patch)
tree29a97bb9d76f8f34cd1def38a229b09458021784 /bootstrap.css
parent5abb4b32004d493ac6bbefcdd1b1f71bdf6e5437 (diff)
downloadbootstrap-160970560b819fe3e3a3396f7385ed8cafc43bf9.tar.xz
bootstrap-160970560b819fe3e3a3396f7385ed8cafc43bf9.zip
updated font mixins courtesy of @apancutt
Diffstat (limited to 'bootstrap.css')
-rw-r--r--bootstrap.css14
1 files changed, 7 insertions, 7 deletions
diff --git a/bootstrap.css b/bootstrap.css
index c88f4ecaf..c1de34a91 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: Thu Nov 17 00:05:35 PST 2011
+ * Date: Thu Nov 17 00:36:27 PST 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).
@@ -477,8 +477,8 @@ blockquote {
padding-left: 15px;
}
blockquote p {
- font-size: 16px;
- font-weight: 300;
+ font-size: 300;
+ font-weight: 16px;
line-height: 22.5px;
margin-bottom: 0;
}
@@ -550,8 +550,8 @@ input,
select,
textarea {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: 13px;
- font-weight: normal;
+ font-size: normal;
+ font-weight: 13px;
line-height: 18px;
}
label {
@@ -1209,8 +1209,8 @@ table .headerSortUp.purple, table .headerSortDown.purple {
background-color: #444;
background-color: rgba(255, 255, 255, 0.3);
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
- font-size: normal;
- font-weight: 13px;
+ font-size: 13px;
+ font-weight: normal;
line-height: 1;
padding: 4px 9px;
color: #ffffff;