Skip to content

Commit

Permalink
refactor(card): Replace hard-coded box-shadow value with mdl-elevation (
Browse files Browse the repository at this point in the history
#4666)

Also, pegs karma-tap at 2.0.x. 2.1.x is
[broken](bySabi/karma-tap#21)

Fixes #4644
[Finishes #127917627]
  • Loading branch information
traviskaufman authored Aug 12, 2016
1 parent c7d800a commit fbf8b25
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"karma-firefox-launcher": "^1.0.0",
"karma-sauce-launcher": "^1.0.0",
"karma-sourcemap-loader": "^0.3.7",
"karma-tap": "^2.0.1",
"karma-tap": "~2.0.1",
"karma-webpack": "^1.7.0",
"lerna": "2.0.0-beta.18",
"lolex": "^1.5.0",
Expand Down
10 changes: 3 additions & 7 deletions packages/mdl-card/mdl-card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,18 @@
* limitations under the License.
*/

@import "mdl-elevation/mixins";
@import "mdl-theme/mixins";
@import "mdl-typography/mixins";

/* postcss-bem-linter: define card */
.mdl-card {
@include mdl-elevation(2);

display: flex;
flex-direction: column;
justify-content: flex-end;
padding: 0;

/* TODO(sgomes): replace with elevation mixin once mdl-elevation is in. */
box-shadow:
0 3px 1px -2px rgba(0, 0, 0, .2),
0 2px 2px 0 rgba(0, 0, 0, .14),
0 1px 5px 0 rgba(0, 0, 0, .12);

overflow: hidden;
box-sizing: border-box;

Expand Down
5 changes: 3 additions & 2 deletions packages/mdl-card/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"description": "The Material Design Lite card component",
"license": "Apache-2.0",
"dependencies": {
"mdl-typography": "^1.0.0",
"mdl-theme": "^1.0.0"
"mdl-elevation": "^1.0.0",
"mdl-theme": "^1.0.0",
"mdl-typography": "^1.0.0"
}
}

0 comments on commit fbf8b25

Please sign in to comment.