diff options
| author | Mark Otto <[email protected]> | 2014-02-08 15:37:35 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-02-08 15:37:35 -0800 |
| commit | c8315edd7397cd3b836da67d50a7c5d7eb7de90c (patch) | |
| tree | a8f2a3f4e6682e540aef63dd00b6dcfb13f355ae /less/type.less | |
| parent | a0052b5a3745737777c88409ae08585ce75b285b (diff) | |
| parent | 91b76e5247ef259b8c51672ed95dbbcfd08b7aac (diff) | |
| download | bootstrap-c8315edd7397cd3b836da67d50a7c5d7eb7de90c.tar.xz bootstrap-c8315edd7397cd3b836da67d50a7c5d7eb7de90c.zip | |
Merge branch 'master' into pr/12639
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'less/type.less')
| -rw-r--r-- | less/type.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/less/type.less b/less/type.less index a55730dfe..ca574edc8 100644 --- a/less/type.less +++ b/less/type.less @@ -233,7 +233,7 @@ abbr[data-original-title] { blockquote { padding: (@line-height-computed / 2) @line-height-computed; margin: 0 0 @line-height-computed; - font-size: (@font-size-base * 1.25); + font-size: @blockquote-font-size; border-left: 5px solid @blockquote-border-color; p, |