mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-05-24 14:04:09 +03:00
Merge branch '3.0.0-wip' of https://github.com/cvrebert/bootstrap into cvrebert-3.0.0-wip
Conflicts: docs/assets/css/bootstrap.css less/mixins.less
This commit is contained in:
Vendored
+13
-5
@@ -1127,7 +1127,10 @@ select[disabled],
|
||||
textarea[disabled],
|
||||
input[readonly],
|
||||
select[readonly],
|
||||
textarea[readonly] {
|
||||
textarea[readonly],
|
||||
fieldset[disabled] input,
|
||||
fieldset[disabled] select,
|
||||
fieldset[disabled] textarea {
|
||||
cursor: not-allowed;
|
||||
background-color: #eeeeee;
|
||||
}
|
||||
@@ -1135,7 +1138,9 @@ textarea[readonly] {
|
||||
input[type="radio"][disabled],
|
||||
input[type="checkbox"][disabled],
|
||||
input[type="radio"][readonly],
|
||||
input[type="checkbox"][readonly] {
|
||||
input[type="checkbox"][readonly],
|
||||
fieldset[disabled] input[type="radio"],
|
||||
fieldset[disabled] input[type="checkbox"] {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
@@ -2583,7 +2588,8 @@ button.close {
|
||||
}
|
||||
|
||||
.btn.disabled,
|
||||
.btn[disabled] {
|
||||
.btn[disabled],
|
||||
fieldset[disabled] .btn {
|
||||
cursor: default;
|
||||
opacity: 0.65;
|
||||
filter: alpha(opacity=65);
|
||||
@@ -2753,7 +2759,8 @@ input[type="button"].btn-block {
|
||||
|
||||
.btn-link,
|
||||
.btn-link:active,
|
||||
.btn-link[disabled] {
|
||||
.btn-link[disabled],
|
||||
fieldset[disabled] .btn-link {
|
||||
background-color: transparent;
|
||||
background-image: none;
|
||||
-webkit-box-shadow: none;
|
||||
@@ -2773,7 +2780,8 @@ input[type="button"].btn-block {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
.btn-link[disabled]:hover {
|
||||
.btn-link[disabled]:hover,
|
||||
fieldset[disabled] .btn-link:hover {
|
||||
color: #333333;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user