From 48c1ffd4f9acf8eda7b559212822d673fcb523ae Mon Sep 17 00:00:00 2001
From: Adam Bradley <adambradley25@gmail.com>
Date: Fri, 17 Jun 2016 22:19:51 -0500
Subject: [PATCH] fix(toolbar): place iOS border on ion-header/footer

---
 src/components/content/content.ts             |  2 +-
 .../searchbar/test/toolbar/main.html          |  2 +-
 src/components/toolbar/toolbar.ios.scss       | 46 ++++++++++++-------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/components/content/content.ts b/src/components/content/content.ts
index d053e76f70..0c7d549233 100644
--- a/src/components/content/content.ts
+++ b/src/components/content/content.ts
@@ -488,7 +488,7 @@ export class Content extends Ion {
       this._scrollEle.style.paddingBottom = (this._paddingBottom > 0 ? this._paddingBottom + 'px' : '');
     }
 
-    if (this._tabbarOnTop && this._tabs) {
+    if (this._tabbarOnTop !== null && this._tabs) {
       if (this._tabbarOnTop) {
         this._tabs.setTabbarPosition(this._headerHeight, -1);
 
diff --git a/src/components/searchbar/test/toolbar/main.html b/src/components/searchbar/test/toolbar/main.html
index a564597ef9..3e02a862d6 100644
--- a/src/components/searchbar/test/toolbar/main.html
+++ b/src/components/searchbar/test/toolbar/main.html
@@ -1,7 +1,7 @@
 <ion-header>
 
   <ion-navbar>
-    <ion-title>Test</ion-title>
+    <ion-title>Searchbar Toolbars</ion-title>
   </ion-navbar>
 
 </ion-header>
diff --git a/src/components/toolbar/toolbar.ios.scss b/src/components/toolbar/toolbar.ios.scss
index f370cad925..c9e5ef8fdc 100644
--- a/src/components/toolbar/toolbar.ios.scss
+++ b/src/components/toolbar/toolbar.ios.scss
@@ -37,29 +37,43 @@ $navbar-ios-height:                         $toolbar-ios-height !default;
 }
 
 
+// iOS Header Toolbar
+// --------------------------------------------------
+
+ion-header {
+  border: 0;
+  border-bottom-width: 1px;
+  border-style: solid;
+  border-color: $toolbar-ios-border-color;
+}
+
+&.hairlines ion-header {
+  border-bottom-width: $hairlines-width;
+}
+
+
+// iOS Footer Toolbar
+// --------------------------------------------------
+
+ion-footer {
+  border: 0;
+  border-top-width: 1px;
+  border-style: solid;
+  border-color: $toolbar-ios-border-color;
+}
+
+&.hairlines ion-footer {
+  border-top-width: $hairlines-width;
+}
+
+
 // iOS Toolbar Background
 // --------------------------------------------------
 
 .toolbar-background {
-  border-bottom-width: 1px;
-  border-style: solid;
-  border-color: $toolbar-ios-border-color;
   background: $toolbar-ios-background;
 }
 
-&.hairlines .toolbar-background {
-  border-bottom-width: $hairlines-width;
-}
-
-.toolbar[position=bottom] .toolbar-background {
-  border-top-width: 1px;
-  border-bottom-width: 0;
-}
-
-&.hairlines .toolbar[position=bottom] .toolbar-background {
-  border-top-width: $hairlines-width;
-}
-
 
 // iOS Toolbar Content
 // --------------------------------------------------