aboutsummaryrefslogtreecommitdiff
path: root/less/type.less
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-07 22:34:51 -0700
committerMark Otto <[email protected]>2012-09-07 22:34:51 -0700
commit7e2958121028b4fdfcd40f7d03dd3c37ceba6a51 (patch)
treea357929a7f065cfd2ad2498412e224eb2d0df458 /less/type.less
parentcb46ddee72eb45f835504a625947c821c8f60635 (diff)
parentf29f98501c11678e2ecfe8fd5c842adcd5a40091 (diff)
downloadbootstrap-7e2958121028b4fdfcd40f7d03dd3c37ceba6a51.tar.xz
bootstrap-7e2958121028b4fdfcd40f7d03dd3c37ceba6a51.zip
Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts: docs/scaffolding.html docs/templates/pages/scaffolding.mustache
Diffstat (limited to 'less/type.less')
-rw-r--r--less/type.less16
1 files changed, 15 insertions, 1 deletions
diff --git a/less/type.less b/less/type.less
index 14f65f2fa..2e0f386ee 100644
--- a/less/type.less
+++ b/less/type.less
@@ -11,7 +11,7 @@ p {
}
.lead {
margin-bottom: @baseLineHeight;
- font-size: 20px;
+ font-size: @baseFontSize * 1.5;
font-weight: 200;
line-height: @baseLineHeight * 1.5;
}
@@ -32,9 +32,23 @@ em {
cite {
font-style: normal;
}
+
+// Utility classes
.muted {
color: @grayLight;
}
+.text-warning {
+ color: @warningText;
+}
+.text-error {
+ color: @errorText;
+}
+.text-info {
+ color: @infoText;
+}
+.text-success {
+ color: @successText;
+}
// Headings