mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-19 16:54:24 +01:00
Merge branch '2.0.1-wip' of https://github.com/simonfranz/bootstrap into simonfranz-2.0.1-wip
This commit is contained in:
commit
b8493ed8b7
5
docs/templates/pages/base-css.mustache
vendored
5
docs/templates/pages/base-css.mustache
vendored
@ -1209,6 +1209,11 @@
|
||||
<td><a class="btn btn-danger" href="#">{{_i}}Danger{{/i}}</a></td>
|
||||
<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>
|
||||
|
@ -133,7 +133,8 @@
|
||||
.btn-primary,
|
||||
.btn-danger,
|
||||
.btn-info,
|
||||
.btn-success {
|
||||
.btn-success,
|
||||
.btn-dark {
|
||||
.caret {
|
||||
border-top-color: @white;
|
||||
.opacity(75);
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user