Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <markdotto@gmail.com>2016-02-17 07:25:40 +0300
committerMark Otto <markdotto@gmail.com>2016-02-17 07:25:40 +0300
commite194db05c8494ccfe6de5c906e9c14b16daf61e8 (patch)
treef9ec60236ee4715e6b586b54b66bbafb89f86bb3 /scss/_type.scss
parent7441beba67bb2e387e647de5d7f69566565594a8 (diff)
parentaca4be6539b33d74b473c441c05b18f4dc850cb1 (diff)
Merge branch 'v4-dev' into mark-padding
Diffstat (limited to 'scss/_type.scss')
-rw-r--r--scss/_type.scss4
1 files changed, 2 insertions, 2 deletions
diff --git a/scss/_type.scss b/scss/_type.scss
index ba476d8892..ff7114074d 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -60,14 +60,14 @@ hr {
small,
.small {
- font-size: 80%;
+ font-size: $small-font-size;
font-weight: normal;
}
mark,
.mark {
padding: $mark-padding;
- background-color: $state-warning-bg;
+ background-color: $mark-bg;
}