diff options
| author | Mark Otto <[email protected]> | 2013-03-31 17:32:45 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-03-31 17:32:45 -0700 |
| commit | 8b9d488377ab9ef10544e53620e0f082d310684e (patch) | |
| tree | 28a5c170329ab95a04032ddba030648cb6c74472 | |
| parent | b7fa0d343446d394535063aca72fa6d7fdd1396f (diff) | |
| download | bootstrap-8b9d488377ab9ef10544e53620e0f082d310684e.tar.xz bootstrap-8b9d488377ab9ef10544e53620e0f082d310684e.zip | |
more consistent btn vars
| -rw-r--r-- | less/buttons.less | 12 | ||||
| -rw-r--r-- | less/variables.less | 26 |
2 files changed, 19 insertions, 19 deletions
diff --git a/less/buttons.less b/less/buttons.less index afe339bc7..d6e334f0e 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -110,26 +110,26 @@ input[type="button"] { .btn { color: @btn-color; - .btn-pseudo-states(@btn-background, @btn-border); + .btn-pseudo-states(@btn-bg, @btn-border); } .btn-primary { - .btn-pseudo-states(@btn-background-primary, @btn-border-primary); + .btn-pseudo-states(@btn-primary-bg, @btn-primary-border); } // Warning appears as orange .btn-warning { - .btn-pseudo-states(@btn-background-warning, @btn-border-warning); + .btn-pseudo-states(@btn-bg-warning, @btn-warning-border); } // Danger and error appear as red .btn-danger { - .btn-pseudo-states(@btn-background-danger, @btn-border-danger); + .btn-pseudo-states(@btn-bg-danger, @btn-danger-border); } // Success appears as green .btn-success { - .btn-pseudo-states(@btn-background-success, @btn-border-success); + .btn-pseudo-states(@btn-bg-success, @btn-success-border); } // Info appears as blue-green .btn-info { - .btn-pseudo-states(@btn-background-info, @btn-border-info); + .btn-pseudo-states(@btn-bg-info, @btn-info-border); } diff --git a/less/variables.less b/less/variables.less index 060e0c97e..31522165c 100644 --- a/less/variables.less +++ b/less/variables.less @@ -84,24 +84,24 @@ // Buttons // ------------------------- -@btn-color: #fff; -@btn-background: #a7a9aa; -@btn-border: @btn-background; +@btn-color: #fff; +@btn-bg: #a7a9aa; +@btn-border: @btn-bg; -@btn-background-primary: @brand-primary; -@btn-border-primary: @btn-background-primary; +@btn-primary-bg: @brand-primary; +@btn-primary-border: @btn-primary-bg; -@btn-background-success: @brand-success; -@btn-border-success: @btn-background-success; +@btn-bg-success: @brand-success; +@btn-success-border: @btn-bg-success; -@btn-background-warning: @brand-warning; -@btn-border-warning: @btn-background-warning; +@btn-bg-warning: @brand-warning; +@btn-warning-border: @btn-bg-warning; -@btn-background-danger: @brand-danger; -@btn-border-danger: @btn-background-danger; +@btn-bg-danger: @brand-danger; +@btn-danger-border: @btn-bg-danger; -@btn-background-info: @brand-info; -@btn-border-info: @btn-background-info; +@btn-bg-info: @brand-info; +@btn-info-border: @btn-bg-info; |