diff options
| author | Mark Otto <[email protected]> | 2012-02-12 15:14:27 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-12 15:14:27 -0800 |
| commit | b8493ed8b773b5e67966fec3837015e77dfed037 (patch) | |
| tree | 6ddce06a601eafe20e5580543676d699d0c5b495 | |
| parent | 1b32e982ade1fc5275a851b711b45f6a0ed21b0c (diff) | |
| parent | d9eff8efc1ee426f3622ab131d8b6726d471040d (diff) | |
| download | bootstrap-b8493ed8b773b5e67966fec3837015e77dfed037.tar.xz bootstrap-b8493ed8b773b5e67966fec3837015e77dfed037.zip | |
Merge branch '2.0.1-wip' of https://github.com/simonfranz/bootstrap into simonfranz-2.0.1-wip
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 5 | ||||
| -rw-r--r-- | less/button-groups.less | 3 | ||||
| -rw-r--r-- | less/buttons.less | 11 |
3 files changed, 16 insertions, 3 deletions
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 04d2c7c07..7f5243dde 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1210,6 +1210,11 @@ <td><code>.btn-danger</code></td> <td>{{_i}}Indicates a dangerous or potentially negative action{{/i}}</td> </tr> + <tr> + <td><a class="btn btn-dark" href="#">{{_i}}Dark{{/i}}</a></td> + <td><code>.btn-dark</code></td> + <td>{{_i}}Indicates a potential abort or black magic{{/i}}</td> + </tr> </tbody> </table> diff --git a/less/button-groups.less b/less/button-groups.less index 4b0523df2..d8957c52d 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -133,7 +133,8 @@ .btn-primary, .btn-danger, .btn-info, -.btn-success { +.btn-success, +.btn-dark { .caret { border-top-color: @white; .opacity(75); diff --git a/less/buttons.less b/less/buttons.less index 5fc423183..0ac2be67a 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -107,7 +107,9 @@ .btn-success, .btn-success:hover, .btn-info, -.btn-info:hover { +.btn-info:hover, +.btn-dark, +.btn-dark:hover { text-shadow: 0 -1px 0 rgba(0,0,0,.25); color: @white; } @@ -116,7 +118,8 @@ .btn-warning.active, .btn-danger.active, .btn-success.active, -.btn-info.active { +.btn-info.active, +.btn-dark.active { color: rgba(255,255,255,.75); } @@ -141,6 +144,10 @@ .btn-info { .buttonBackground(#5bc0de, #2f96b4); } +// Dark appears as black +.btn-dark { + .buttonBackground(#454545, #262626); +} // Cross-browser Jank |