diff options
| author | Mark Otto <[email protected]> | 2012-02-19 16:00:54 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-19 16:00:54 -0800 |
| commit | f4f34ab12f0f89e6a11f6b752ab82fb01bd746d4 (patch) | |
| tree | 1fd89eb7715f4acff7e48a077fcd5413e39f0079 /less | |
| parent | 59d570fc160c71dc21f77735e9d14797e247d859 (diff) | |
| parent | 1e6d386b8df2d7235b23a96ddd0489c1ab2650dc (diff) | |
| download | bootstrap-f4f34ab12f0f89e6a11f6b752ab82fb01bd746d4.tar.xz bootstrap-f4f34ab12f0f89e6a11f6b752ab82fb01bd746d4.zip | |
Merge branch 'andriijas-2.0.1-wip' into 2.0.2-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'less')
| -rw-r--r-- | less/buttons.less | 2 | ||||
| -rw-r--r-- | less/labels.less | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/less/buttons.less b/less/buttons.less index bdc1932ca..490c74a7b 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -152,7 +152,7 @@ } // Inverse appears as dark gray .btn-inverse { - .buttonBackground(#454545, #262626); + .buttonBackground(@gray, @grayDarker); } diff --git a/less/labels.less b/less/labels.less index 268435a0b..ae6b00e02 100644 --- a/less/labels.less +++ b/less/labels.less @@ -30,3 +30,6 @@ .label-info { background-color: @infoText; } .label-info:hover { background-color: darken(@infoText, 10%); } + +.label-inverse { background-color: @grayDark; } +.label-inverse:hover { background-color: darken(@grayDark, 10%); }
\ No newline at end of file |