From 617b7ac000f62ed1166dbee5c42dce2f82b86111 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Thu, 21 Apr 2016 16:14:21 -0400
Subject: [PATCH] fix(show-hide-when): add !important to display as this should
 always take precedence

fixes #6270
---
 ionic/components/show-hide-when/show-hide-when.scss  |  4 ++--
 ionic/components/show-hide-when/test/basic/main.html | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ionic/components/show-hide-when/show-hide-when.scss b/ionic/components/show-hide-when/show-hide-when.scss
index d47865bf23c..40eb064f696 100644
--- a/ionic/components/show-hide-when/show-hide-when.scss
+++ b/ionic/components/show-hide-when/show-hide-when.scss
@@ -5,10 +5,10 @@
 
 // Applied by the showWhen directive
 .hidden-show-when {
-  display: none;
+  display: none !important;
 }
 
 // Applied by the hideWhen directive
 .hidden-hide-when {
-  display: none;
+  display: none !important;
 }
diff --git a/ionic/components/show-hide-when/test/basic/main.html b/ionic/components/show-hide-when/test/basic/main.html
index 07ac5d9aac2..41fa32c34dd 100644
--- a/ionic/components/show-hide-when/test/basic/main.html
+++ b/ionic/components/show-hide-when/test/basic/main.html
@@ -1,8 +1,18 @@
 
-<ion-toolbar><ion-title>Show/Hide When</ion-title></ion-toolbar>
+<ion-toolbar>
+  <ion-title>Show/Hide When</ion-title>
+  <ion-buttons end>
+    <button showWhen="ios">iOS</button>
+    <button showWhen="windows">Windows</button>
+    <button showWhen="android">Android</button>
+  </ion-buttons>
+</ion-toolbar>
 
 
 <ion-content padding>
+  <button showWhen="ios">iOS</button>
+  <button showWhen="windows">Windows</button>
+  <button showWhen="android">Android</button>
 
   <p showWhen="ios" style="background:blue; color:white">
     showWhen="ios"