diff options
| author | Mark Otto <[email protected]> | 2015-05-13 21:20:02 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-05-13 21:20:02 -0700 |
| commit | 82279a8eb28fcddf24ecdf524686583e408b5191 (patch) | |
| tree | 74b6f1b30a555387d1393b22f797491dc6ae7fae /less | |
| parent | f2adfeb62def2c968cc370c9dfa0ef4e5fc1f5cd (diff) | |
| parent | 9a451d4aea98d59a0bad032ec4fd80a4ea1bc8e1 (diff) | |
| download | bootstrap-82279a8eb28fcddf24ecdf524686583e408b5191.tar.xz bootstrap-82279a8eb28fcddf24ecdf524686583e408b5191.zip | |
Merge branch 'btn-borders' of https://github.com/martinbean/bootstrap into martinbean-btn-borders
Diffstat (limited to 'less')
| -rw-r--r-- | less/button-groups.less | 4 | ||||
| -rw-r--r-- | less/buttons.less | 8 | ||||
| -rw-r--r-- | less/variables.less | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index 84443c88b..6a0c5a865 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -173,11 +173,11 @@ border-radius: 0; } &:first-child:not(:last-child) { - border-top-right-radius: @border-radius-base; + border-top-right-radius: @btn-border-radius-base; .border-bottom-radius(0); } &:last-child:not(:first-child) { - border-bottom-left-radius: @border-radius-base; + border-bottom-left-radius: @btn-border-radius-base; .border-top-radius(0); } } diff --git a/less/buttons.less b/less/buttons.less index 740905f52..9cbb8f416 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -17,7 +17,7 @@ background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214 border: 1px solid transparent; white-space: nowrap; - .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base); + .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @btn-border-radius-base); .user-select(none); &, @@ -132,14 +132,14 @@ .btn-lg { // line-height: ensure even-numbered height of button next to large input - .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @border-radius-large); + .button-size(@padding-large-vertical; @padding-large-horizontal; @font-size-large; @line-height-large; @btn-border-radius-large); } .btn-sm { // line-height: ensure proper height of button next to small input - .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @border-radius-small); + .button-size(@padding-small-vertical; @padding-small-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small); } .btn-xs { - .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @border-radius-small); + .button-size(@padding-xs-vertical; @padding-xs-horizontal; @font-size-small; @line-height-small; @btn-border-radius-small); } diff --git a/less/variables.less b/less/variables.less index dd3c102ab..a55d03072 100644 --- a/less/variables.less +++ b/less/variables.less @@ -170,6 +170,11 @@ @btn-link-disabled-color: @gray-light; +//** Allows for customizing button radius independently from global border radius +@btn-border-radius-base: @border-radius-base; +@btn-border-radius-large: @border-radius-large; +@btn-border-radius-small: @border-radius-small; + //== Forms // |