javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(ripple): navbar button ripple

Browse Source 
C
This commit is contained in:
Adam Bradley
2015-09-29 14:36:06 -05:00
parent f37a48bad4
commit ba08227c74
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components/tap-click/ripple.ts
View File

@ -23,7 +23,7 @@ export class RippleActivator extends Activator {
let x = Math.max(Math.abs(clientRect.width - clientPointerX), clientPointerX) * 2; let x = Math.max(Math.abs(clientRect.width - clientPointerX), clientPointerX) * 2;
let y = Math.max(Math.abs(clientRect.height - clientPointerY), clientPointerY) * 2; let y = Math.max(Math.abs(clientRect.height - clientPointerY), clientPointerY) * 2;
let diameter = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2)); let diameter = Math.max(Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2)), 64);
let radius = Math.sqrt(clientRect.width + clientRect.height); let radius = Math.sqrt(clientRect.width + clientRect.height);
let duration = (1000 * Math.sqrt(radius / TOUCH_DOWN_ACCEL) + 0.5); let duration = (1000 * Math.sqrt(radius / TOUCH_DOWN_ACCEL) + 0.5);

1
ionic/components/toolbar/modes/md.scss
View File

@ -19,6 +19,7 @@ $toolbar-md-button-font-size: 1.4rem !default;
padding: 0 5px; padding: 0 5px;
min-height: 32px; min-height: 32px;
box-shadow: none; box-shadow: none;
overflow: visible;
} }
button.icon-only, button.icon-only,

1
ionic/components/toolbar/toolbar.scss
View File

@ -27,6 +27,7 @@ $toolbar-order: (
padding: $toolbar-padding; padding: $toolbar-padding;
width: 100%; width: 100%;
overflow: hidden;
button, button,
[button] { [button] {