rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-30 22:52:24 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.0-wip' of https://github.com/vickash/bootstrap into vickash-3.0.0-wip

Browse Source
This commit is contained in:
Mark Otto 2013-02-02 19:08:59 -08:00
commit 2f7087eae9
2 changed files with 105 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
docs/assets/css/bootstrap.css vendored
View File

@ -1745,6 +1745,19 @@ input[type="button"].btn-block {
border-color: #8d9091; border-color: #8d9091;
} }
.btn.disabled:hover,
.btn[disabled]:hover,
fieldset[disabled] .btn:hover,
.btn.disabled:focus,
.btn[disabled]:focus,
fieldset[disabled] .btn:focus,
.btn.disabled:active,
.btn[disabled]:active,
fieldset[disabled] .btn:active {
background-color: #a7a9aa;
border-color: #a7a9aa;
}
.btn-primary { .btn-primary {
background-color: #428bca; background-color: #428bca;
border-color: #428bca; border-color: #428bca;
@ -1757,6 +1770,19 @@ input[type="button"].btn-block {
border-color: #3071a9; border-color: #3071a9;
} }
.btn-primary.disabled:hover,
.btn-primary[disabled]:hover,
fieldset[disabled] .btn-primary:hover,
.btn-primary.disabled:focus,
.btn-primary[disabled]:focus,
fieldset[disabled] .btn-primary:focus,
.btn-primary.disabled:active,
.btn-primary[disabled]:active,
fieldset[disabled] .btn-primary:active {
background-color: #428bca;
border-color: #428bca;
}
.btn-warning { .btn-warning {
background-color: #f0ad4e; background-color: #f0ad4e;
border-color: #f0ad4e; border-color: #f0ad4e;
@ -1769,6 +1795,19 @@ input[type="button"].btn-block {
border-color: #ec971f; border-color: #ec971f;
} }
.btn-warning.disabled:hover,
.btn-warning[disabled]:hover,
fieldset[disabled] .btn-warning:hover,
.btn-warning.disabled:focus,
.btn-warning[disabled]:focus,
fieldset[disabled] .btn-warning:focus,
.btn-warning.disabled:active,
.btn-warning[disabled]:active,
fieldset[disabled] .btn-warning:active {
background-color: #f0ad4e;
border-color: #f0ad4e;
}
.btn-danger { .btn-danger {
background-color: #d9534f; background-color: #d9534f;
border-color: #d9534f; border-color: #d9534f;
@ -1781,6 +1820,19 @@ input[type="button"].btn-block {
border-color: #c9302c; border-color: #c9302c;
} }
.btn-danger.disabled:hover,
.btn-danger[disabled]:hover,
fieldset[disabled] .btn-danger:hover,
.btn-danger.disabled:focus,
.btn-danger[disabled]:focus,
fieldset[disabled] .btn-danger:focus,
.btn-danger.disabled:active,
.btn-danger[disabled]:active,
fieldset[disabled] .btn-danger:active {
background-color: #d9534f;
border-color: #d9534f;
}
.btn-success { .btn-success {
background-color: #5cb85c; background-color: #5cb85c;
border-color: #5cb85c; border-color: #5cb85c;
@ -1793,6 +1845,19 @@ input[type="button"].btn-block {
border-color: #449d44; border-color: #449d44;
} }
.btn-success.disabled:hover,
.btn-success[disabled]:hover,
fieldset[disabled] .btn-success:hover,
.btn-success.disabled:focus,
.btn-success[disabled]:focus,
fieldset[disabled] .btn-success:focus,
.btn-success.disabled:active,
.btn-success[disabled]:active,
fieldset[disabled] .btn-success:active {
background-color: #5cb85c;
border-color: #5cb85c;
}
.btn-info { .btn-info {
background-color: #5bc0de; background-color: #5bc0de;
border-color: #5bc0de; border-color: #5bc0de;
@ -1805,6 +1870,19 @@ input[type="button"].btn-block {
border-color: #31b0d5; border-color: #31b0d5;
} }
.btn-info.disabled:hover,
.btn-info[disabled]:hover,
fieldset[disabled] .btn-info:hover,
.btn-info.disabled:focus,
.btn-info[disabled]:focus,
fieldset[disabled] .btn-info:focus,
.btn-info.disabled:active,
.btn-info[disabled]:active,
fieldset[disabled] .btn-info:active {
background-color: #5bc0de;
border-color: #5bc0de;
}
.btn-link, .btn-link,
.btn-link:active, .btn-link:active,
.btn-link[disabled], .btn-link[disabled],

63
less/buttons.less
View File

@ -109,7 +109,26 @@ input[type="button"] {
} }
} }
// Mixin for darkening only enabled buttons for link states
.darken-button-states (@background, @border) {
&:hover,
&:focus,
&:active {
background-color: darken(@background, 5%);
border-color: darken(@border, 10%);
}
&.disabled,
&[disabled],
fieldset[disabled] & {
&:hover,
&:focus,
&:active {
background-color: @background;
border-color: @border
}
}
}
// Alternate buttons // Alternate buttons
// -------------------------------------------------- // --------------------------------------------------
@ -118,66 +137,36 @@ input[type="button"] {
color: @btn-color; color: @btn-color;
background-color: @btn-background; background-color: @btn-background;
border-color: @btn-border; border-color: @btn-border;
&:hover, .darken-button-states(@btn-background, @btn-border)
&:focus,
&:active {
background-color: darken(@btn-background, 5%);
border-color: darken(@btn-border, 10%);
}
} }
.btn-primary { .btn-primary {
background-color: @btn-background-primary; background-color: @btn-background-primary;
border-color: @btn-border-primary; border-color: @btn-border-primary;
&:hover, .darken-button-states(@btn-background-primary, @btn-border-primary)
&:focus,
&:active {
background-color: darken(@btn-background-primary, 5%);
border-color: darken(@btn-border-primary, 10%);
} }
} // Warning appears as orange
// Warning appears are orange
.btn-warning { .btn-warning {
background-color: @btn-background-warning; background-color: @btn-background-warning;
border-color: @btn-border-warning; border-color: @btn-border-warning;
&:hover, .darken-button-states(@btn-background-warning, @btn-border-warning)
&:focus,
&:active {
background-color: darken(@btn-background-warning, 5%);
border-color: darken(@btn-border-warning, 10%);
}
} }
// Danger and error appear as red // Danger and error appear as red
.btn-danger { .btn-danger {
background-color: @btn-background-danger; background-color: @btn-background-danger;
border-color: @btn-border-danger; border-color: @btn-border-danger;
&:hover, .darken-button-states(@btn-background-danger, @btn-border-danger)
&:focus,
&:active {
background-color: darken(@btn-background-danger, 5%);
border-color: darken(@btn-border-danger, 10%);
}
} }
// Success appears as green // Success appears as green
.btn-success { .btn-success {
background-color: @btn-background-success; background-color: @btn-background-success;
border-color: @btn-border-success; border-color: @btn-border-success;
&:hover, .darken-button-states(@btn-background-success, @btn-border-success)
&:focus,
&:active {
background-color: darken(@btn-background-success, 5%);
border-color: darken(@btn-border-success, 10%);
}
} }
// Info appears as blue-green // Info appears as blue-green
.btn-info { .btn-info {
background-color: @btn-background-info; background-color: @btn-background-info;
border-color: @btn-border-info; border-color: @btn-border-info;
&:hover, .darken-button-states(@btn-background-info, @btn-border-info)
&:focus,
&:active {
background-color: darken(@btn-background-info, 5%);
border-color: darken(@btn-border-info, 10%);
}
} }