javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-11-04 13:17:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(back-button): ios style

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-03-23 11:11:41 +01:00
parent ce09978eee
commit 2b8e489f84
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/components/back-button/back-button.ios.scss
View File

@ -29,11 +29,11 @@
.back-button-ios ion-icon { .back-button-ios ion-icon {
@include padding(0); @include padding(0);
@include margin(0, -4px, 0, 0); @include margin(0, -5px, 0, -4px);
display: inherit; display: inherit;
font-size: 1.75em; font-size: 1.85em;
pointer-events: none; pointer-events: none;
} }

5
core/src/components/scroll/scroll.tsx
View File

@ -18,11 +18,11 @@ export class Scroll {
private lastScroll = 0; private lastScroll = 0;
private detail: ScrollDetail; private detail: ScrollDetail;
private queued = false; private queued = false;
@Element() private el: HTMLElement; @Element() private el: HTMLElement;
@Prop({ context: 'config'}) config: Config; @Prop({ context: 'config'}) config: Config;
@Prop({ context: 'dom' }) dom: DomController; @Prop({ context: 'dom' }) dom: DomController;
@Prop({ context: 'isServer' }) isServer: boolean;
@Prop() mode: string; @Prop() mode: string;
@ -78,9 +78,6 @@ export class Scroll {
} }
componentWillLoad() { componentWillLoad() {
if (this.isServer) {
return;
}
if (this.forceOverscroll === undefined) { if (this.forceOverscroll === undefined) {
this.forceOverscroll = this.mode === 'ios' && ('ontouchstart' in window); this.forceOverscroll = this.mode === 'ios' && ('ontouchstart' in window);
} }