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

Change elevation for the pressed and focused states #17

Merged
merged 1 commit into from May 21, 2015
Merged

Change elevation for the pressed and focused states #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions paper-button-behavior.html
View file
Open in desktop
Expand Up @@ -35,9 +35,9 @@
if (this.disabled || !this.raised) {
e = 0;
} else if (this.active || this.pressed) {
e = 2;
e = 4;
} else if (this.focused) {
e = 3;
e = 2;
}
this._elevation = e;
}
Expand Down
4 changes: 2 additions & 2 deletions test/paper-button-behavior.html
View file
Open in desktop
Expand Up @@ -88,7 +88,7 @@
test('activated by tap', function(done) {
MockInteractions.downAndUp(button, function() {
try {
assert.equal(button._elevation, 2);
assert.equal(button._elevation, 4);
done();
} catch (e) {
done(e);
Expand All @@ -98,7 +98,7 @@

test('receives focused', function() {
MockInteractions.focus(button);
assert.equal(button._elevation, 3);
assert.equal(button._elevation, 2);
})
});

Expand Down