diff --git a/ionic/components/app/structure.scss b/ionic/components/app/structure.scss index 844aa22392..ce1362fb29 100644 --- a/ionic/components/app/structure.scss +++ b/ionic/components/app/structure.scss @@ -113,6 +113,4 @@ swipe-handle { width: $swipe-handle-width; height: 100%; z-index: $z-index-swipe-handle; - background: red; - opacity: 0.5; } diff --git a/ionic/components/content/content.scss b/ionic/components/content/content.scss index 3e7cb2f97a..9290195d97 100644 --- a/ionic/components/content/content.scss +++ b/ionic/components/content/content.scss @@ -2,9 +2,14 @@ // Content // -------------------------------------------------- -$content-background-color: #fff !default; +$content-container-background-color: #fff !default; +$content-background-color: #fff !default; -.nav-item-container { +.content-container { + background-color: $content-container-background-color; +} + +ion-content { background-color: $content-background-color; } diff --git a/ionic/components/content/extensions/ios.scss b/ionic/components/content/extensions/ios.scss index eff09fa4c1..866c2fc3fa 100644 --- a/ionic/components/content/extensions/ios.scss +++ b/ionic/components/content/extensions/ios.scss @@ -2,14 +2,18 @@ // iOS Content // -------------------------------------------------- -$nav-container-ios-background-color: #000 !default; -$content-ios-background-color: #efeff4 !default; +$content-container-ios-background-color: #000 !default; +$content-ios-background-color: #efeff4 !default; -.platform-ios .nav-item-container { - background-color: $nav-container-ios-background-color; -} - -.platform-ios ion-content { - background-color: $content-ios-background-color; +.nav-ios { + + .content-container { + background-color: $content-container-ios-background-color; + } + + ion-content { + background-color: $content-ios-background-color; + } + } diff --git a/ionic/components/nav/nav.js b/ionic/components/nav/nav.js index 58ff00fac0..150daffab6 100644 --- a/ionic/components/nav/nav.js +++ b/ionic/components/nav/nav.js @@ -1,4 +1,4 @@ -import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; +import {Parent} from 'angular2/src/core/annotations_impl/visibility'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {View} from 'angular2/src/core/annotations_impl/view'; import {ElementRef} from 'angular2/src/core/compiler/element_ref'; @@ -47,7 +47,7 @@ new IonicComponent(Nav, {}); selector: '[navbar-anchor]' }) class NavbarAnchor { - constructor(@Ancestor() nav: Nav, viewContainerRef: ViewContainerRef) { + constructor(@Parent() nav: Nav, viewContainerRef: ViewContainerRef) { nav.navbarContainerRef = viewContainerRef; } } @@ -57,7 +57,7 @@ class NavbarAnchor { selector: '[content-anchor]' }) class ContentAnchor { - constructor(@Ancestor() nav: Nav, elementRef: ElementRef) { + constructor(@Parent() nav: Nav, elementRef: ElementRef) { nav.contentElementRef = elementRef; } } diff --git a/ionic/components/nav/swipe-handle.js b/ionic/components/nav/swipe-handle.js index 00f294c5c2..d4005558e6 100644 --- a/ionic/components/nav/swipe-handle.js +++ b/ionic/components/nav/swipe-handle.js @@ -1,5 +1,5 @@ import {ElementRef} from 'angular2/angular2' -import {Ancestor} from 'angular2/src/core/annotations_impl/visibility'; +import {Parent} from 'angular2/src/core/annotations_impl/visibility'; import {Directive} from 'angular2/src/core/annotations_impl/annotations'; import {Gesture} from 'ionic/gestures/gesture'; @@ -10,11 +10,9 @@ import {Nav} from './nav'; selector: 'swipe-handle' }) export class SwipeHandle { - constructor(@Ancestor() nav: Nav, elementRef: ElementRef) { + constructor(@Parent() nav: Nav, elementRef: ElementRef) { let gesture = new Gesture(elementRef.domElement); - this.hidden = true; - gesture.listen(); gesture.on('panend', onDragEnd); diff --git a/ionic/components/nav/test/basic/main.html b/ionic/components/nav/test/basic/main.html index 94cd0153aa..162fbd5049 100644 --- a/ionic/components/nav/test/basic/main.html +++ b/ionic/components/nav/test/basic/main.html @@ -1,2 +1,15 @@ + + diff --git a/ionic/components/nav/test/basic/pages/first-page.html b/ionic/components/nav/test/basic/pages/first-page.html index 7db5b18498..8e7b0468d1 100644 --- a/ionic/components/nav/test/basic/pages/first-page.html +++ b/ionic/components/nav/test/basic/pages/first-page.html @@ -13,4 +13,7 @@

+ + + diff --git a/ionic/components/nav/test/basic/pages/second-page.html b/ionic/components/nav/test/basic/pages/second-page.html index 66dba74a1d..21c53cb059 100644 --- a/ionic/components/nav/test/basic/pages/second-page.html +++ b/ionic/components/nav/test/basic/pages/second-page.html @@ -19,6 +19,9 @@

+ + +