fix shadow extensions

This commit is contained in:
Kevin Ross 2015-11-02 19:17:00 -06:00
parent 51669b9e00
commit 89ed4e4b7b
6 changed files with 23 additions and 8 deletions

View File

@ -14,7 +14,22 @@ module.exports = function(grunt) {
src: ['*.less', '!_mixins.less', '!_mixins-fullpalette.less'], src: ['*.less', '!_mixins.less', '!_mixins-fullpalette.less'],
ext: '.scss', ext: '.scss',
dest: 'sass' dest: 'sass'
}] }],
options: {
replacements: [
{ // bad conversions to @include instead of @extend
pattern: /@include shadow-z-(\d+)\(\);/gi,
replacement: '@extend .shadow-z-$1;',
order: 2
},
{ // bad conversions to @include instead of @extend
pattern: /@include (foo1|foo2)\(\);/gi,
replacement: '@extend .$1;',
order: 2
}
]
}
} }
}, },

View File

@ -10,7 +10,7 @@
color: $darkbg-text; color: $darkbg-text;
&:hover:not(.btn-link):not(.btn-flat):not(.btn-fab) { &:hover:not(.btn-link):not(.btn-flat):not(.btn-fab) {
@include shadow-z-1(); @extend .shadow-z-1;
} }
&:active:not(.btn-link):not(.btn-flat):not(.btn-fab) { &:active:not(.btn-link):not(.btn-flat):not(.btn-fab) {
@include shadow-z-1-hover(); @include shadow-z-1-hover();
@ -75,7 +75,7 @@
@include variations(unquote(""), background-color, transparent); @include variations(unquote(""), background-color, transparent);
} }
&, &:hover { &, &:hover {
@include shadow-z-1(); @extend .shadow-z-1;
} }
&:active { &:active {
@include shadow-z-1-hover(); @include shadow-z-1-hover();
@ -137,7 +137,7 @@
} }
@mixin btn-shadow(){ @mixin btn-shadow(){
@include shadow-z-1(); @extend .shadow-z-1;
transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1); transition: box-shadow 0.28s cubic-bezier(0.4, 0, 0.2, 1);
&:active:not(.btn-link) { &:active:not(.btn-link) {
@include shadow-z-1-hover(); @include shadow-z-1-hover();

View File

@ -23,7 +23,7 @@
color: $card-body-text; color: $card-body-text;
background: $card-body-background; background: $card-body-background;
@include shadow-z-2(); @extend .shadow-z-2;
.card-image { .card-image {
height: 60%; height: 60%;

View File

@ -3,7 +3,7 @@
// Material Design element Dialogs // Material Design element Dialogs
// -------------------------------------------------- // --------------------------------------------------
.modal-content { .modal-content {
@include shadow-z-5(); @extend .shadow-z-5;
border-radius: 2px; border-radius: 2px;
border: none; border: none;
// Modal header // Modal header

View File

@ -4,7 +4,7 @@
background: $popover-background; background: $popover-background;
border: none; border: none;
border-radius: $material-border-radius; border-radius: $material-border-radius;
@include shadow-z-1(); @extend .shadow-z-1;
} }
.tooltip, .tooltip.in { .tooltip, .tooltip.in {

View File

@ -11,7 +11,7 @@ body, .container, .container-fluid {
background-color: #fff; background-color: #fff;
padding: 19px; padding: 19px;
margin-bottom: 20px; margin-bottom: 20px;
@include shadow-z-2(); @extend .shadow-z-2;
border-radius: 2px; border-radius: 2px;
border: 0; border: 0;
p { p {