diff options
| author | Mark Otto <[email protected]> | 2013-04-08 10:16:15 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-04-08 10:16:15 -0700 |
| commit | 5b04985722a1b1637e85e35f74b1386a37af4dba (patch) | |
| tree | dc64b5683b6236967685b6bb0e1f58d99c993e7e | |
| parent | c2a35f1ec8c60b6207405e64351fbfaccba8c5a1 (diff) | |
| parent | 09b97a3b95d3ab37e86461c71a75dbeb4fab7e91 (diff) | |
| download | bootstrap-5b04985722a1b1637e85e35f74b1386a37af4dba.tar.xz bootstrap-5b04985722a1b1637e85e35f74b1386a37af4dba.zip | |
Merge pull request #7504 from acmetech/3.0.0-wip
variable update - fixed
| -rw-r--r-- | less/buttons.less | 8 | ||||
| -rw-r--r-- | less/navbar.less | 4 | ||||
| -rw-r--r-- | less/variables.less | 20 |
3 files changed, 16 insertions, 16 deletions
diff --git a/less/buttons.less b/less/buttons.less index d6e334f0e..a412bd5ff 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -117,19 +117,19 @@ input[type="button"] { } // Warning appears as orange .btn-warning { - .btn-pseudo-states(@btn-bg-warning, @btn-warning-border); + .btn-pseudo-states(@btn-warning-bg, @btn-warning-border); } // Danger and error appear as red .btn-danger { - .btn-pseudo-states(@btn-bg-danger, @btn-danger-border); + .btn-pseudo-states(@btn-danger-bg, @btn-danger-border); } // Success appears as green .btn-success { - .btn-pseudo-states(@btn-bg-success, @btn-success-border); + .btn-pseudo-states(@btn-success-bg, @btn-success-border); } // Info appears as blue-green .btn-info { - .btn-pseudo-states(@btn-bg-info, @btn-info-border); + .btn-pseudo-states(@btn-info-bg, @btn-info-border); } diff --git a/less/navbar.less b/less/navbar.less index ac950ca9b..01d747ef5 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -193,8 +193,8 @@ color: @navbar-inverse-brand-color; &:hover, &:focus { - color: @navbar-inverse-brand-color-hover; - background-color: @navbar-inverse-brand-bg-hover; + color: @navbar-inverse-brand-hover-color; + background-color: @navbar-inverse-brand-hover-bg; } } diff --git a/less/variables.less b/less/variables.less index 57a08f3b2..30ac7a59d 100644 --- a/less/variables.less +++ b/less/variables.less @@ -91,17 +91,17 @@ @btn-primary-bg: @brand-primary; @btn-primary-border: @btn-primary-bg; -@btn-bg-success: @brand-success; -@btn-success-border: @btn-bg-success; +@btn-success-bg: @brand-success; +@btn-success-border: @btn-success-bg; -@btn-bg-warning: @brand-warning; -@btn-warning-border: @btn-bg-warning; +@btn-warning-bg: @brand-warning; +@btn-warning-border: @btn-warning-bg; -@btn-bg-danger: @brand-danger; -@btn-danger-border: @btn-bg-danger; +@btn-danger-bg: @brand-danger; +@btn-danger-border: @btn-danger-bg; -@btn-bg-info: @brand-info; -@btn-info-border: @btn-bg-info; +@btn-info-bg: @brand-info; +@btn-info-border: @btn-info-bg; @@ -190,8 +190,8 @@ // Inverted navbar brand label @navbar-inverse-brand-color: @navbar-inverse-link-color; -@navbar-inverse-brand-color-hover: #fff; -@navbar-inverse-brand-bg-hover: transparent; +@navbar-inverse-brand-hover-color: #fff; +@navbar-inverse-brand-hover-bg: transparent; // Inverted navbar links @navbar-inverse-link-color: @grayLight; |