Skip to content

Commit

Permalink
fix(show-hide-when): add !important to display as this should always …
Browse files Browse the repository at this point in the history
…take precedence

fixes #6270
  • Loading branch information
brandyscarney committed Apr 21, 2016
1 parent 1ca4f37 commit 617b7ac
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
4 changes: 2 additions & 2 deletions ionic/components/show-hide-when/show-hide-when.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
12 changes: 11 additions & 1 deletion ionic/components/show-hide-when/test/basic/main.html
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 617b7ac

Please sign in to comment.