diff options
| author | Mark Otto <[email protected]> | 2014-01-18 14:40:17 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-18 14:40:17 -0800 |
| commit | 3b6ab5075e881f6486145f2b3aea22bf53ee44e7 (patch) | |
| tree | c86ff1bb0d1715544241e35371541877e301e25e /less/variables.less | |
| parent | cd1bea0616a8fb1b94d8021bc8dbc0cbc2eaf4aa (diff) | |
| parent | 572e6a959aba6fa905c6377b900566b7ecc7c8f4 (diff) | |
| download | bootstrap-3b6ab5075e881f6486145f2b3aea22bf53ee44e7.tar.xz bootstrap-3b6ab5075e881f6486145f2b3aea22bf53ee44e7.zip | |
Merge branch 'master' into bg-variant
Conflicts:
less/mixins.less
Diffstat (limited to 'less/variables.less')
| -rw-r--r-- | less/variables.less | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/less/variables.less b/less/variables.less index d9147eb59..e431f47b3 100644 --- a/less/variables.less +++ b/less/variables.less @@ -561,6 +561,7 @@ @modal-footer-border-color: @modal-header-border-color; @modal-lg: 900px; +@modal-md: 600px; @modal-sm: 300px; |