From ff73d83138aeba893a58f32ad88dc20f6dea56d7 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Wed, 25 Nov 2015 14:23:54 -0500
Subject: [PATCH] fix(toolbar): added a temp fix for buttons in a toolbar with
 a segment

added a segment scenario to the toolbar tests. closes #506
---
 .../toolbar/test/scenarios/index.ts           |  8 ++++-
 .../toolbar/test/scenarios/main.html          | 31 ++++++++++++++++++-
 ionic/components/toolbar/toolbar.scss         |  6 ++++
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/ionic/components/toolbar/test/scenarios/index.ts b/ionic/components/toolbar/test/scenarios/index.ts
index 43aed36502..590a6f9d35 100644
--- a/ionic/components/toolbar/test/scenarios/index.ts
+++ b/ionic/components/toolbar/test/scenarios/index.ts
@@ -4,4 +4,10 @@ import {App} from 'ionic/ionic';
 @App({
   templateUrl: 'main.html'
 })
-class E2EApp {}
+class E2EApp {
+
+
+  buttonClick(button) {
+    console.log(button);
+  }
+}
diff --git a/ionic/components/toolbar/test/scenarios/main.html b/ionic/components/toolbar/test/scenarios/main.html
index 1500da91e4..2a1a98c698 100644
--- a/ionic/components/toolbar/test/scenarios/main.html
+++ b/ionic/components/toolbar/test/scenarios/main.html
@@ -180,7 +180,7 @@
 
 <ion-toolbar>
 <ion-nav-items secondary>
-  <button>
+  <button #button1 (click)="buttonClick(button1)">
     <icon star></icon>
   </button>
 </ion-nav-items>
@@ -190,6 +190,35 @@
   </a>
 </ion-toolbar>
 
+<ion-toolbar>
+  <ion-nav-items secondary>
+    <button #button2 (click)="buttonClick(button2)">
+      <icon search></icon>
+    </button>
+  </ion-nav-items>
+  <ion-segment secondary>
+    <ion-segment-button>
+      Something
+    </ion-segment-button>
+    <ion-segment-button>
+      Else
+    </ion-segment-button>
+  </ion-segment>
+</ion-toolbar>
+
+<ion-toolbar>
+  <ion-segment>
+    <ion-segment-button>
+      Light
+    </ion-segment-button>
+    <ion-segment-button>
+      Toolbar
+    </ion-segment-button>
+    <ion-segment-button>
+      Default Segment
+    </ion-segment-button>
+  </ion-segment>
+</ion-toolbar>
 
 
 <style>
diff --git a/ionic/components/toolbar/toolbar.scss b/ionic/components/toolbar/toolbar.scss
index 82e0a52add..d83b7d2c11 100644
--- a/ionic/components/toolbar/toolbar.scss
+++ b/ionic/components/toolbar/toolbar.scss
@@ -124,6 +124,12 @@ ion-nav-items div {
   pointer-events: auto;
 }
 
+// TODO this is a temp hack to fix segment overlapping ion-nav-item
+ion-nav-items,
+[menu-toggle] {
+  z-index: 99;
+}
+
 
 // Toolbar Color Generation
 // --------------------------------------------------