Skip to content
This repository has been archived by the owner on Sep 5, 2024. It is now read-only.

Commit

Permalink
fix(button): update to match design spec
Browse files Browse the repository at this point in the history
Closes #1987
  • Loading branch information
Marcy Sutton committed Mar 23, 2015
1 parent 59af0de commit ad786c2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
18 changes: 7 additions & 11 deletions src/components/button/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,13 @@ $button-fab-toast-offset: $button-fab-height * 0.75;
overflow: hidden; // for ink containment

transition: box-shadow $swift-ease-out-duration $swift-ease-out-timing-function,
background-color $swift-ease-out-duration $swift-ease-out-timing-function,
transform $swift-ease-out-duration $swift-ease-out-timing-function;
background-color $swift-ease-out-duration $swift-ease-out-timing-function;

&:focus {
outline: none;
}

&:hover {
&:hover, &:focus {
text-decoration: none;
}

Expand All @@ -77,13 +76,15 @@ $button-fab-toast-offset: $button-fab-height * 0.75;
}

&.md-raised {
transform: translate3d(0, 0, 0);

&:not([disabled]) {
@extend .md-shadow-bottom-z-1;
}
}

&:not(.md-fab) {
min-width: 5.500rem;
}

&.md-fab {

@include fab-position(bottom-right, auto, ($button-fab-width - $button-fab-padding)/2, ($button-fab-height - $button-fab-padding)/2, auto);
Expand All @@ -101,10 +102,8 @@ $button-fab-toast-offset: $button-fab-height * 0.75;
background-clip: padding-box;
overflow: hidden;

transform: translate3d(0,0,0);

transition: 0.2s linear;
transition-property: transform, box-shadow;
transition-property: background-color, box-shadow;
.md-ripple-container {
border-radius: 50%;
background-clip: padding-box;
Expand All @@ -120,16 +119,13 @@ $button-fab-toast-offset: $button-fab-height * 0.75;
&.md-mini {
width: $button-fab-mini-width;
height: $button-fab-mini-height;
md-icon {
}
}

}

&:not([disabled]) {
&.md-raised,
&.md-fab {
transform: translate3d(0, -1px, 0);
&:focus {
@extend .md-shadow-bottom-z-1;
}
Expand Down
6 changes: 0 additions & 6 deletions src/components/button/demoBasicUsage/style.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@

/** From vulcanized demo **/

section {
background: #f7f7f7;
border-radius: 3px;
Expand All @@ -12,9 +9,6 @@ section {
md-content {
margin-right: 7px;
}
section .md-button:not(.md-fab) {
min-width: 10em;
}
section .md-button {
display: block;
margin: 1em;
Expand Down

0 comments on commit ad786c2

Please sign in to comment.