assets/stylesheets/material/material/_button.scss in material-sass-4.0.0.beta2 vs assets/stylesheets/material/material/_button.scss in material-sass-4.0.0.beta3
- old
+ new
@@ -29,34 +29,34 @@
@include focus-hover {
background-image: linear-gradient(to bottom, $btn-overlay, $btn-overlay);
}
- &:active,
- &.active {
+ &.active,
+ &:active {
background-color: $btn-bg-active;
background-image: none;
box-shadow: map-get($btn-elevation-shadow-active, shadow);
}
- &:disabled,
- &.disabled {
+ &.disabled,
+ &:disabled {
background-color: $btn-bg-disabled;
background-image: none;
box-shadow: none;
color: $btn-color-disabled;
opacity: 1;
-
- .waves-ripple {
- display: none;
- }
}
&:focus {
outline: 0;
}
+ &:not([disabled]):not(.disabled) {
+ cursor: pointer;
+ }
+
.show > &.dropdown-toggle {
background-image: linear-gradient(to bottom, $btn-overlay, $btn-overlay);
}
}
@@ -74,26 +74,26 @@
@include active-focus-hover {
color: color-yiq(map-get(theme-color($color), color));
}
- &:active,
- &.active {
+ &.active,
+ &:active {
background-color: map-get(theme-color($color), darker);
}
- &:disabled,
- &.disabled {
+ &.disabled,
+ &:disabled {
background-color: $btn-bg-disabled;
color: $btn-color-disabled;
}
}
}
[class*='bg-dark'] :not([class*='bg-light']) .btn {
- &:disabled,
- &.disabled {
+ &.disabled,
+ &:disabled {
background-color: $btn-bg-disabled-inverse;
color: $btn-color-disabled-inverse;
}
}
@@ -146,17 +146,17 @@
@include focus-hover {
background-image: none;
}
- &:active,
- &.active {
+ &.active,
+ &:active {
background-color: transparent;
box-shadow: none;
}
- &:disabled,
- &.disabled {
+ &.disabled,
+ &:disabled {
background-color: transparent;
color: $btn-color-disabled;
text-decoration: none;
}
}