Skip to content

Commit

Permalink
fix(item-divider): fabs have higher z-index than item-dividers
Browse files Browse the repository at this point in the history
fixes #8489
  • Loading branch information
manucorporat committed Oct 6, 2016
1 parent 713e2a1 commit 14e668c
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/components/item/item.scss
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ ion-item-group {
}

ion-item-divider {
z-index: 1000;
z-index: $z-index-item-divider;
display: flex;
overflow: hidden;

Expand Down
10 changes: 10 additions & 0 deletions src/components/list/test/header-scenarios/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@
</ion-header>

<ion-content class="outer-content">

<div>
<ion-fab top right>
<button ion-fab><ion-icon name="add"></ion-icon></button>
</ion-fab>
</div>
<ion-fab bottom right>
<button ion-fab><ion-icon name="close"></ion-icon></button>
</ion-fab>

<ion-list>
<!--<ion-list-header>
ion-list-header
Expand Down
9 changes: 9 additions & 0 deletions src/components/list/test/headers/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@

<ion-content class="outer-content">

<div>
<ion-fab top right>
<button ion-fab><ion-icon name="add"></ion-icon></button>
</ion-fab>
</div>
<ion-fab bottom right>
<button ion-fab><ion-icon name="close"></ion-icon></button>
</ion-fab>

<ion-list>

<ion-list-header>
Expand Down
9 changes: 9 additions & 0 deletions src/components/list/test/inset/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@

<ion-content class="outer-content">

<div>
<ion-fab top right>
<button ion-fab><ion-icon name="add"></ion-icon></button>
</ion-fab>
</div>
<ion-fab bottom right>
<button ion-fab><ion-icon name="close"></ion-icon></button>
</ion-fab>

<ion-list inset>

<ion-list-header>
Expand Down
10 changes: 10 additions & 0 deletions src/components/list/test/sticky/main.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
<ion-content>

<div>
<ion-fab top right>
<button ion-fab><ion-icon name="add"></ion-icon></button>
</ion-fab>
</div>
<ion-fab bottom right>
<button ion-fab><ion-icon name="close"></ion-icon></button>
</ion-fab>

<ion-list>
<ion-item-group *ngFor="let group of groups">
<ion-item-divider sticky>{{group.title}}</ion-item-divider>
Expand Down
3 changes: 2 additions & 1 deletion src/themes/ionic.globals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ $z-index-menu-backdrop: 79;
$z-index-overlay: 1000;
$z-index-click-block: 9999;

$z-index-fixed-content: 100;
$z-index-fixed-content: 999;
$z-index-scroll-content: 1;
$z-index-refresher: 0;

Expand All @@ -44,3 +44,4 @@ $z-index-backdrop: 2;
$z-index-overlay-wrapper: 10;

$z-index-item-options: 1;
$z-index-item-divider: 100;

0 comments on commit 14e668c

Please sign in to comment.