diff options
| author | fat <[email protected]> | 2014-06-23 23:08:23 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2014-06-23 23:08:23 -0700 |
| commit | 0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3 (patch) | |
| tree | 7b88c388d526ada7b564f1faf44cda92276f2722 /less/type.less | |
| parent | f071549c8408241b88a95192e477816d2402eb6e (diff) | |
| parent | b31c35b63629ec750f338a646f6b730bd675b734 (diff) | |
| download | bootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.tar.xz bootstrap-0aa01f63e33e0fb4c0c770dba7d2a631b9b562d3.zip | |
Merge branch 'master' into fix-13386
Conflicts:
js/carousel.js
Diffstat (limited to 'less/type.less')
| -rw-r--r-- | less/type.less | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/less/type.less b/less/type.less index 93414474a..9b1e48bae 100644 --- a/less/type.less +++ b/less/type.less @@ -74,10 +74,10 @@ p { // Emphasis & misc // ------------------------- -// Ex: 14px base font * 85% = about 12px +// Ex: (12px small font / 14px base font) * 100% = about 85% small, .small { - font-size: 85%; + font-size: floor((100% * @font-size-small / @font-size-base)); } // Undo browser default styling @@ -219,13 +219,13 @@ dd { @media (min-width: @grid-float-breakpoint) { dt { float: left; - width: (@component-offset-horizontal - 20); + width: (@dl-horizontal-offset - 20); clear: left; text-align: right; .text-overflow(); } dd { - margin-left: @component-offset-horizontal; + margin-left: @dl-horizontal-offset; } } } |