diff --git a/packages/core/src/components/action-sheet/action-sheet.ios.scss b/packages/core/src/components/action-sheet/action-sheet.ios.scss index 8633bcec17..408219ab99 100644 --- a/packages/core/src/components/action-sheet/action-sheet.ios.scss +++ b/packages/core/src/components/action-sheet/action-sheet.ios.scss @@ -61,6 +61,18 @@ $action-sheet-ios-button-text-color: #007aff !default; /// @prop - Fill color of the action sheet button icon $action-sheet-ios-button-icon-fill-color: $action-sheet-ios-button-text-color !default; +/// @prop - Font size of the action sheet button icon +$action-sheet-ios-button-icon-font-size: 1.4em !default; + +/// @prop - Padding right of the action sheet button icon +$action-sheet-ios-button-icon-padding-right: 0.1em !default; + +/// @prop - Height of the action sheet button icon +$action-sheet-ios-button-icon-height: .7em !default; + +/// @prop - Margin top of the action sheet button icon +$action-sheet-ios-button-icon-margin-top: -10px !default; + /// @prop - Font size of the action sheet button $action-sheet-ios-button-font-size: 2rem !default; @@ -138,8 +150,12 @@ $action-sheet-ios-button-cancel-font-weight: 600 !default; background: $action-sheet-ios-button-background; } -.action-sheet-ios .action-sheet-button { +.action-sheet-ios .action-sheet-button .action-sheet-icon { fill: $action-sheet-ios-button-icon-fill-color; + font-size: $action-sheet-ios-button-icon-font-size; + padding-right: $action-sheet-ios-button-icon-padding-right; + height: $action-sheet-ios-button-icon-height; + margin-top: $action-sheet-ios-button-icon-margin-top; } .action-sheet-ios .action-sheet-button:last-child { diff --git a/packages/core/src/components/action-sheet/action-sheet.tsx b/packages/core/src/components/action-sheet/action-sheet.tsx index 89399ac839..70f8c90fcf 100644 --- a/packages/core/src/components/action-sheet/action-sheet.tsx +++ b/packages/core/src/components/action-sheet/action-sheet.tsx @@ -179,10 +179,12 @@ export class ActionSheet { : null} {buttons.map(b => )} diff --git a/packages/core/src/components/action-sheet/animations/ios.enter.ts b/packages/core/src/components/action-sheet/animations/ios.enter.ts index ec15295383..44327414b9 100644 --- a/packages/core/src/components/action-sheet/animations/ios.enter.ts +++ b/packages/core/src/components/action-sheet/animations/ios.enter.ts @@ -1,7 +1,7 @@ import { Animation } from '../../../index'; /** - * iOS Loading Enter Animation + * iOS Action Sheet Animation */ export default function(Animation: Animation, baseElm: HTMLElement) { const baseAnimation = new Animation(); @@ -12,7 +12,7 @@ export default function(Animation: Animation, baseElm: HTMLElement) { const wrapperAnimation = new Animation(); wrapperAnimation.addElement(baseElm.querySelector('.action-sheet-wrapper')); - backdropAnimation.fromTo('opacity', 0.01, 0.26); + backdropAnimation.fromTo('opacity', 0.01, 0.4); wrapperAnimation.fromTo('translateY', '100%', '0%'); diff --git a/packages/core/src/components/action-sheet/animations/ios.leave.ts b/packages/core/src/components/action-sheet/animations/ios.leave.ts index cf280b2af6..d534e389be 100644 --- a/packages/core/src/components/action-sheet/animations/ios.leave.ts +++ b/packages/core/src/components/action-sheet/animations/ios.leave.ts @@ -1,7 +1,7 @@ import { Animation } from '../../../index'; /** - * iOS Loading Leave Animation + * iOS Action Sheet Leave Animation */ export default function(Animation: Animation, baseElm: HTMLElement) { const baseAnimation = new Animation(); @@ -12,7 +12,7 @@ export default function(Animation: Animation, baseElm: HTMLElement) { const wrapperAnimation = new Animation(); wrapperAnimation.addElement(baseElm.querySelector('.action-sheet-wrapper')); - backdropAnimation.fromTo('opacity', 0.26, 0); + backdropAnimation.fromTo('opacity', 0.4, 0); wrapperAnimation.fromTo('translateY', '0%', '100%'); diff --git a/packages/core/src/components/action-sheet/test/basic.html b/packages/core/src/components/action-sheet/test/basic.html index c134e2a0aa..904edb88ba 100644 --- a/packages/core/src/components/action-sheet/test/basic.html +++ b/packages/core/src/components/action-sheet/test/basic.html @@ -18,12 +18,15 @@ Present Action Sheet 1 + Present Action Sheet 2 + Present Action Sheet 3