mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-11 18:02:28 +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:
+12
-5
@@ -39,7 +39,8 @@
|
||||
}
|
||||
|
||||
&.disabled,
|
||||
&[disabled] {
|
||||
&[disabled],
|
||||
fieldset[disabled] & {
|
||||
cursor: default;
|
||||
.opacity(65);
|
||||
.box-shadow(none);
|
||||
@@ -138,7 +139,8 @@ input[type="button"] {
|
||||
// Make a button look and behave like a link
|
||||
.btn-link,
|
||||
.btn-link:active,
|
||||
.btn-link[disabled] {
|
||||
.btn-link[disabled],
|
||||
fieldset[disabled] .btn-link {
|
||||
background-color: transparent;
|
||||
background-image: none;
|
||||
.box-shadow(none);
|
||||
@@ -154,7 +156,12 @@ input[type="button"] {
|
||||
text-decoration: underline;
|
||||
background-color: transparent;
|
||||
}
|
||||
.btn-link[disabled]:hover {
|
||||
color: @grayDark;
|
||||
text-decoration: none;
|
||||
.btn-link {
|
||||
&[disabled],
|
||||
fieldset[disabled] & {
|
||||
&:hover {
|
||||
color: @grayDark;
|
||||
text-decoration: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user