From 281f9a307f35993bf991536fd548a6b24cc1117e Mon Sep 17 00:00:00 2001
From: "Manu Mtz.-Almeida" <manu.mtza@gmail.com>
Date: Sat, 1 Sep 2018 18:07:17 +0200
Subject: [PATCH] fix(menu): ios styles

---
 core/src/components/menu/menu.ios.scss | 4 ----
 core/src/components/menu/menu.md.scss  | 4 ----
 core/src/components/menu/menu.scss     | 3 +++
 core/src/components/menu/menu.tsx      | 6 ++++--
 core/src/components/picker/picker.tsx  | 3 ++-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/src/components/menu/menu.ios.scss b/core/src/components/menu/menu.ios.scss
index 4786bf444e..84249faa44 100644
--- a/core/src/components/menu/menu.ios.scss
+++ b/core/src/components/menu/menu.ios.scss
@@ -4,10 +4,6 @@
 // iOS Menu
 // --------------------------------------------------
 
-.menu-inner {
-  background: $menu-ios-background;
-}
-
 :host(.menu-type-overlay) .menu-inner {
   box-shadow: $menu-ios-box-shadow-overlay;
 }
diff --git a/core/src/components/menu/menu.md.scss b/core/src/components/menu/menu.md.scss
index e295c51eed..29d4a1886c 100644
--- a/core/src/components/menu/menu.md.scss
+++ b/core/src/components/menu/menu.md.scss
@@ -4,10 +4,6 @@
 // Material Design Menu
 // --------------------------------------------------
 
-.menu-inner {
-  background: $menu-md-background;
-}
-
 :host(.menu-type-overlay) .menu-inner {
   box-shadow: $menu-md-box-shadow;
 }
diff --git a/core/src/components/menu/menu.scss b/core/src/components/menu/menu.scss
index 3beef6959c..c7d91c2ffc 100644
--- a/core/src/components/menu/menu.scss
+++ b/core/src/components/menu/menu.scss
@@ -6,6 +6,7 @@
 :host {
   --width: #{$menu-width};
   --width-small: #{$menu-small-width};
+  --background: #{$background-color};
 
   @include position(0, 0, 0, 0);
 
@@ -33,6 +34,8 @@
   width: var(--width);
   height: 100%;
 
+  background: var(--background);
+
   contain: strict;
 }
 
diff --git a/core/src/components/menu/menu.tsx b/core/src/components/menu/menu.tsx
index 27094072ca..301da91bca 100644
--- a/core/src/components/menu/menu.tsx
+++ b/core/src/components/menu/menu.tsx
@@ -60,8 +60,10 @@ export class Menu implements MenuI {
   @Watch('type')
   typeChanged(type: string, oldType: string | undefined) {
     const contentEl = this.contentEl;
-    if (contentEl && oldType) {
-      contentEl.classList.remove(`menu-content-${oldType}`);
+    if (contentEl) {
+      if (oldType) {
+        contentEl.classList.remove(`menu-content-${oldType}`);
+      }
       contentEl.classList.add(`menu-content-${type}`);
       contentEl.removeAttribute('style');
     }
diff --git a/core/src/components/picker/picker.tsx b/core/src/components/picker/picker.tsx
index ee9c76e390..16cc3c6c27 100644
--- a/core/src/components/picker/picker.tsx
+++ b/core/src/components/picker/picker.tsx
@@ -251,7 +251,8 @@ export class Picker implements OverlayInterface {
     return [
       <ion-backdrop
         visible={this.showBackdrop}
-        tappable={this.backdropDismiss}>
+        tappable={this.backdropDismiss}
+      >
       </ion-backdrop>,
 
       <div class="picker-wrapper" role="dialog">