diff options
| author | Mark Otto <[email protected]> | 2013-10-14 11:06:25 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-10-14 11:06:25 -0700 |
| commit | 6307d2c94d879e802610e366087bff75883d70a4 (patch) | |
| tree | 1c43da1bf8d67c1fff25fe19033451176cd56ee3 /less | |
| parent | 1f5c754d576f9534da2cc2176bf2193d31ed6937 (diff) | |
| parent | 70278a4e4f6c2e9079d72a2993b69efd3a965ba0 (diff) | |
| download | bootstrap-6307d2c94d879e802610e366087bff75883d70a4.tar.xz bootstrap-6307d2c94d879e802610e366087bff75883d70a4.zip | |
Merge branch 'master' of github.com:twbs/bootstrap
Conflicts:
getting-started.html
Diffstat (limited to 'less')
| -rw-r--r-- | less/variables.less | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/less/variables.less b/less/variables.less index 9b55f13b6..e596215d0 100644 --- a/less/variables.less +++ b/less/variables.less @@ -48,9 +48,9 @@ @font-size-large: ceil(@font-size-base * 1.25); // ~18px @font-size-small: ceil(@font-size-base * 0.85); // ~12px -@font-size-h1: floor(@font-size-base * 2.60); // ~36px +@font-size-h1: floor(@font-size-base * 2.6); // ~36px @font-size-h2: floor(@font-size-base * 2.15); // ~30px -@font-size-h3: ceil(@font-size-base * 1.70); // ~24px +@font-size-h3: ceil(@font-size-base * 1.7); // ~24px @font-size-h4: ceil(@font-size-base * 1.25); // ~18px @font-size-h5: @font-size-base; @font-size-h6: ceil(@font-size-base * 0.85); // ~12px |