diff options
| author | Mark Otto <[email protected]> | 2012-01-26 15:25:19 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-26 15:25:19 -0800 |
| commit | 2d67c3408465f44be7336abc6a00af870d2c18f8 (patch) | |
| tree | 00035c926c09fba04023b55ae3337464b37e3379 /lib/buttons.less | |
| parent | f398926e4647df1e7e5a2abdbc9e2e9e775eeb34 (diff) | |
| parent | 721b8a10785c548fa6a1cb26ccd698ceabc43e36 (diff) | |
| download | bootstrap-2d67c3408465f44be7336abc6a00af870d2c18f8.tar.xz bootstrap-2d67c3408465f44be7336abc6a00af870d2c18f8.zip | |
Merge branch 'form_alignment' of https://github.com/phopkins/bootstrap into phopkins-form_alignment
Conflicts:
bootstrap.css
bootstrap.min.css
Diffstat (limited to 'lib/buttons.less')
| -rw-r--r-- | lib/buttons.less | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/buttons.less b/lib/buttons.less index 2cbcc1d4f..d7f533783 100644 --- a/lib/buttons.less +++ b/lib/buttons.less @@ -66,9 +66,9 @@ .btn { // Button Base display: inline-block; - padding: 5px 10px 6px; + padding: 4px 10px 4px; font-size: @baseFontSize; - line-height: normal; + line-height: @baseLineHeight; color: @grayDark; text-shadow: 0 1px 1px rgba(255,255,255,.75); #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient @@ -132,8 +132,9 @@ margin-top: 1px; } &.small { - padding: 7px 9px 7px; + padding: 5px 9px 5px; font-size: @baseFontSize - 2px; + line-height: @baseLineHeight - 2px; } &.small .icon { margin-top: -2px; |