From 2b8e489f8481b20314038a254b9a95fe40cd7903 Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.mtza@gmail.com>
Date: Fri, 23 Mar 2018 11:11:41 +0100
Subject: [PATCH] fix(back-button): ios style

---
 core/src/components/back-button/back-button.ios.scss | 4 ++--
 core/src/components/scroll/scroll.tsx                | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/src/components/back-button/back-button.ios.scss b/core/src/components/back-button/back-button.ios.scss
index 6256897212..1367b8719e 100644
--- a/core/src/components/back-button/back-button.ios.scss
+++ b/core/src/components/back-button/back-button.ios.scss
@@ -29,11 +29,11 @@
 
 .back-button-ios ion-icon {
   @include padding(0);
-  @include margin(0, -4px, 0, 0);
+  @include margin(0, -5px, 0, -4px);
 
   display: inherit;
 
-  font-size: 1.75em;
+  font-size: 1.85em;
 
   pointer-events: none;
 }
diff --git a/core/src/components/scroll/scroll.tsx b/core/src/components/scroll/scroll.tsx
index d7b93432fb..08b9b3b10c 100644
--- a/core/src/components/scroll/scroll.tsx
+++ b/core/src/components/scroll/scroll.tsx
@@ -18,11 +18,11 @@ export class Scroll {
   private lastScroll = 0;
   private detail: ScrollDetail;
   private queued = false;
+
   @Element() private el: HTMLElement;
 
   @Prop({ context: 'config'}) config: Config;
   @Prop({ context: 'dom' }) dom: DomController;
-  @Prop({ context: 'isServer' }) isServer: boolean;
 
   @Prop() mode: string;
 
@@ -78,9 +78,6 @@ export class Scroll {
   }
 
   componentWillLoad() {
-    if (this.isServer) {
-      return;
-    }
     if (this.forceOverscroll === undefined) {
       this.forceOverscroll = this.mode === 'ios' && ('ontouchstart' in window);
     }