Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(button): improved tap responsiveness on mobile #1792

Merged
merged 2 commits into from
Nov 11, 2016
Merged

fix(button): improved tap responsiveness on mobile #1792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0f4d3d
fix(button): improved tap responsiveness on mobile
crisbeto Nov 9, 2016
bb0c74d
Rename the tint class and add a comment regarding the `touchstart` ha…
crisbeto Nov 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 3 additions & 19 deletions src/lib/button/_button-base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,6 @@
@import '../core/style/button-common';


// Applies a focus style to an md-button element.
@mixin md-button-focus {
&::after {
// The button spec calls for focus on raised buttons (and FABs) to be indicated with a
// black, 12% opacity shade over the normal color (for both light and dark themes).
// We do this by placing an :after pseudo-element with the appropriate shade over the button.
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
content: '';
background-color: rgba(black, 0.12);
border-radius: inherit;
pointer-events: none;
}
}

// Flat and raised button standards
$md-button-padding: 0 16px !default;
$md-button-min-width: 88px !default;
Expand Down Expand Up @@ -74,7 +56,9 @@ $md-mini-fab-padding: 8px !default;
}

&.md-button-focus {
@include md-button-focus();
.md-button-focus-overlay {
opacity: 1;
}
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/lib/button/_button-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
$accent: map-get($theme, accent);
$warn: map-get($theme, warn);

&.md-primary::after {
&.md-primary .md-button-focus-overlay {
background-color: md-color($primary, 0.12);
}

&.md-accent::after {
&.md-accent .md-button-focus-overlay {
background-color: md-color($accent, 0.12);
}

&.md-warn::after {
&.md-warn .md-button-focus-overlay {
background-color: md-color($warn, 0.12);
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/lib/button/button.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
[md-ripple-trigger]="getHostElement()"
[md-ripple-color]="isRoundButton() ? 'rgba(255, 255, 255, 0.2)' : ''"
md-ripple-background-color="rgba(0, 0, 0, 0)"></div>
<!-- the touchstart handler prevents the overlay from capturing the initial tap on touch devices -->
<div class="md-button-focus-overlay" (touchstart)="$event.preventDefault()"></div>
20 changes: 17 additions & 3 deletions src/lib/button/button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,13 @@
// Only flat buttons and icon buttons (not raised or fabs) have a hover style.
&:hover {
// Use the same visual treatment for hover as for focus.
@include md-button-focus();
.md-button-focus-overlay {
opacity: 1;
}
}

&[disabled]:hover {
&.md-primary, &.md-accent, &.md-warn, &::after {
&.md-primary, &.md-accent, &.md-warn, .md-button-focus-overlay {
background-color: transparent;
}
}
Expand Down Expand Up @@ -56,14 +58,26 @@
}

// The ripple container should match the bounds of the entire button.
.md-button-ripple {
.md-button-ripple, .md-button-focus-overlay {
position: absolute;
top: 0;
left: 0;
bottom: 0;
right: 0;
}

// Overlay to be used as a tint. Note that the same effect can be achieved by using a pseudo
// element, however we use a proper DOM element in order to be able to disable the default
// touch action. This makes the buttons more responsive on touch devices.
.md-button-focus-overlay {
// The button spec calls for focus on raised buttons (and FABs) to be indicated with a
// black, 12% opacity shade over the normal color (for both light and dark themes).
background-color: rgba(black, 0.12);
border-radius: inherit;
pointer-events: none;
opacity: 0;
}

// For round buttons, the ripple container should clip child ripples to a circle.
.md-button-ripple-round {
border-radius: 50%;
Expand Down