Skip to content

Commit

Permalink
fix(content): scroll=false in sidemenu hides content
Browse files Browse the repository at this point in the history
Closes #1485
  • Loading branch information
Adam Bradley committed Jun 13, 2014
1 parent 8da9f34 commit 53c1710
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion demos/directive/sideMenus/navWithMenu/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<header class="bar bar-header bar-stable">
<h1 class="title">Left</h1>
</header>
<ion-content class="has-header">
<ion-content class="has-header" scroll="false">
<ion-list>
<ion-item nav-clear menu-close href="#/app/search">
Search
Expand Down
2 changes: 2 additions & 0 deletions js/angular/directive/content.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ function($timeout, $controller, $ionicBind) {
innerElement = jqLite('<div class="scroll"></div>');
innerElement.append(element.contents());
element.append(innerElement);
} else {
element.addClass('scroll-content-false');
}

return { pre: prelink };
Expand Down
4 changes: 4 additions & 0 deletions scss/_scaffolding.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ body.grade-c {
height: auto;
}

.scroll-content-false {
z-index: $z-index-scroll-content-false;
}

.scroll-view {
position: relative;
display: block;
Expand Down
2 changes: 2 additions & 0 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -673,10 +673,12 @@ $z-index-modal: 10 !default;
$z-index-pane: 1 !default;
$z-index-popup: 12 !default;
$z-index-scroll-bar: 9999 !default;
$z-index-scroll-content-false: 10 !default;
$z-index-slider-pager: 1 !default;
$z-index-tabs: 5 !default;
$z-index-view: 1 !default;


// Platform
// -------------------------------

Expand Down

0 comments on commit 53c1710

Please sign in to comment.