diff options
| author | Mark Otto <[email protected]> | 2013-08-12 10:06:34 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-12 10:06:34 -0700 |
| commit | 3d11e6dedf0174e2124985828f64c6fe68c874f6 (patch) | |
| tree | f34f6bdd2f7c7a85c122115dcba0c63ec1a36a3b | |
| parent | a9a27d37944bbc1edb1248d22e596707af85502a (diff) | |
| parent | 83293516b6b1785e8f57dc26b9023f26cd7a89a1 (diff) | |
| download | bootstrap-3d11e6dedf0174e2124985828f64c6fe68c874f6.tar.xz bootstrap-3d11e6dedf0174e2124985828f64c6fe68c874f6.zip | |
Merge pull request #9371 from ggam/buttons-consistency
Renamed btn-pseudo-states mixin to btn-variant for consistency
| -rw-r--r-- | less/buttons.less | 12 | ||||
| -rw-r--r-- | less/mixins.less | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/less/buttons.less b/less/buttons.less index 8dc05e824..1527a5fa0 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -54,26 +54,26 @@ // -------------------------------------------------- .btn-default { - .btn-pseudo-states(@btn-default-color; @btn-default-bg; @btn-default-border); + .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border); } .btn-primary { - .btn-pseudo-states(@btn-primary-color; @btn-primary-bg; @btn-primary-border); + .button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border); } // Warning appears as orange .btn-warning { - .btn-pseudo-states(@btn-warning-color; @btn-warning-bg; @btn-warning-border); + .button-variant(@btn-warning-color; @btn-warning-bg; @btn-warning-border); } // Danger and error appear as red .btn-danger { - .btn-pseudo-states(@btn-danger-color; @btn-danger-bg; @btn-danger-border); + .button-variant(@btn-danger-color; @btn-danger-bg; @btn-danger-border); } // Success appears as green .btn-success { - .btn-pseudo-states(@btn-success-color; @btn-success-bg; @btn-success-border); + .button-variant(@btn-success-color; @btn-success-bg; @btn-success-border); } // Info appears as blue-green .btn-info { - .btn-pseudo-states(@btn-info-color; @btn-info-bg; @btn-info-border); + .button-variant(@btn-info-color; @btn-info-bg; @btn-info-border); } diff --git a/less/mixins.less b/less/mixins.less index ee7e5570e..309868251 100644 --- a/less/mixins.less +++ b/less/mixins.less @@ -352,11 +352,11 @@ } } -// Button pseudo states +// Button variants // ------------------------- // Easily pump out default styles, as well as :hover, :focus, :active, // and disabled options for all buttons -.btn-pseudo-states(@color; @background; @border) { +.button-variant(@color; @background; @border) { color: @color; background-color: @background; border-color: @border; |