Skip to content

Commit

Permalink
fix(elevation): change elevations to match spec (#1857)
Browse files Browse the repository at this point in the history
  • Loading branch information
mmalerba authored and kara committed Nov 17, 2016
1 parent cf3f86f commit c2597b6
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
6 changes: 6 additions & 0 deletions src/lib/button/_button-base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ $md-mini-fab-padding: 8px !default;
@mixin md-fab($size, $padding) {
@extend %md-raised-button;

@include md-elevation(6);

// Reset the min-width from the button base.
min-width: 0;

Expand All @@ -98,6 +100,10 @@ $md-mini-fab-padding: 8px !default;

flex-shrink: 0;

&:active {
@include md-elevation(12);
}

i, md-icon {
padding: $padding 0;
line-height: $md-icon-button-line-height;
Expand Down
6 changes: 1 addition & 5 deletions src/lib/card/card.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ $md-card-border-radius: 2px !default;
$md-card-header-size: 40px !default;

md-card {
@include md-elevation(1);
@include md-elevation(2);
@include md-elevation-transition;
display: block;
position: relative;
Expand All @@ -17,10 +17,6 @@ md-card {
font-family: $md-font-family;
}

md-card:hover {
@include md-elevation(2);
}

.md-card-flat {
box-shadow: none;
}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/core/style/_menu-common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $md-menu-font-size: 16px !default;
$md-menu-side-padding: 16px !default;

@mixin md-menu-base() {
@include md-elevation(2);
@include md-elevation(8);
min-width: $md-menu-overlay-min-width;
max-width: $md-menu-overlay-max-width;

Expand Down Expand Up @@ -86,4 +86,4 @@ $md-menu-side-padding: 16px !default;
transform-origin: left bottom;
}
}
}
}
6 changes: 3 additions & 3 deletions src/lib/sidenav/sidenav.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@
transform: translate3d($close, 0, 0);
}
&.md-sidenav-opening {
@include md-elevation(1);
@include md-elevation(16);
visibility: visible;
transform: translate3d($open, 0, 0);
}
&.md-sidenav-opened {
@include md-elevation(1);
@include md-elevation(16);
transform: translate3d($open, 0, 0);
}
}
Expand Down Expand Up @@ -132,4 +132,4 @@ md-sidenav {

.md-sidenav-invalid {
display: none;
}
}
2 changes: 1 addition & 1 deletion src/lib/snack-bar/snack-bar-container.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ $md-snack-bar-max-width: 568px !default;


:host {
@include md-elevation(24);
@include md-elevation(6);
background: #323232;
border-radius: 2px;
box-sizing: content-box;
Expand Down

0 comments on commit c2597b6

Please sign in to comment.