diff --git a/demos/component-docs/app.css b/demos/component-docs/app.css index e6435fcc70..40473a3a31 100644 --- a/demos/component-docs/app.css +++ b/demos/component-docs/app.css @@ -194,3 +194,12 @@ ion-card.adv-map p { color: #32DB64; } +body.md .android-attr, body.md .android-attr div.toolbar-background { + background-color: #387EF5; +} +body.md .android-attr .toolbar-title { + color: #fff; +} + + + diff --git a/demos/component-docs/buttons/block.html b/demos/component-docs/buttons/block.html index 41ac4b3567..b002eab326 100644 --- a/demos/component-docs/buttons/block.html +++ b/demos/component-docs/buttons/block.html @@ -1,4 +1,4 @@ - + Block Buttons diff --git a/demos/component-docs/buttons/buttons.html b/demos/component-docs/buttons/buttons.html index 3b70e451e5..048147ec22 100644 --- a/demos/component-docs/buttons/buttons.html +++ b/demos/component-docs/buttons/buttons.html @@ -1,4 +1,4 @@ - + Buttons diff --git a/demos/component-docs/buttons/clear.html b/demos/component-docs/buttons/clear.html index 3acd89b5c5..a3e040634b 100644 --- a/demos/component-docs/buttons/clear.html +++ b/demos/component-docs/buttons/clear.html @@ -1,4 +1,4 @@ - + Clear Buttons diff --git a/demos/component-docs/buttons/components.html b/demos/component-docs/buttons/components.html index ba7d12673b..bfe3a4c354 100644 --- a/demos/component-docs/buttons/components.html +++ b/demos/component-docs/buttons/components.html @@ -1,4 +1,4 @@ - + Buttons diff --git a/demos/component-docs/buttons/fab.html b/demos/component-docs/buttons/fab.html index deada245ae..199dbb7bfa 100644 --- a/demos/component-docs/buttons/fab.html +++ b/demos/component-docs/buttons/fab.html @@ -1,4 +1,4 @@ - + FAB diff --git a/demos/component-docs/buttons/full.html b/demos/component-docs/buttons/full.html index 86933539b5..fa02185c8c 100644 --- a/demos/component-docs/buttons/full.html +++ b/demos/component-docs/buttons/full.html @@ -1,4 +1,4 @@ - + Full Buttons diff --git a/demos/component-docs/buttons/icons.html b/demos/component-docs/buttons/icons.html index 38c750a552..ca9efbe285 100644 --- a/demos/component-docs/buttons/icons.html +++ b/demos/component-docs/buttons/icons.html @@ -1,5 +1,5 @@ - + Icon Buttons diff --git a/demos/component-docs/buttons/outline.html b/demos/component-docs/buttons/outline.html index af59bb2435..e1cf50ff87 100644 --- a/demos/component-docs/buttons/outline.html +++ b/demos/component-docs/buttons/outline.html @@ -1,4 +1,4 @@ - + Outline Buttons diff --git a/demos/component-docs/buttons/round.html b/demos/component-docs/buttons/round.html index 2ddd56fce0..45260b9575 100644 --- a/demos/component-docs/buttons/round.html +++ b/demos/component-docs/buttons/round.html @@ -1,4 +1,4 @@ - + Round Buttons diff --git a/demos/component-docs/buttons/sizes.html b/demos/component-docs/buttons/sizes.html index 6a5b64a469..3fa4b2c3e9 100644 --- a/demos/component-docs/buttons/sizes.html +++ b/demos/component-docs/buttons/sizes.html @@ -1,4 +1,4 @@ - + Button Sizes diff --git a/demos/component-docs/cards/cards-advanced-image.html b/demos/component-docs/cards/cards-advanced-image.html index 832a7bb04a..7c341faf0e 100644 --- a/demos/component-docs/cards/cards-advanced-image.html +++ b/demos/component-docs/cards/cards-advanced-image.html @@ -1,5 +1,5 @@ - + Advanced: Image diff --git a/demos/component-docs/cards/cards-advanced-map.html b/demos/component-docs/cards/cards-advanced-map.html index d5ce1ff92d..edb373848a 100644 --- a/demos/component-docs/cards/cards-advanced-map.html +++ b/demos/component-docs/cards/cards-advanced-map.html @@ -1,5 +1,5 @@ - + Advanced: Map diff --git a/demos/component-docs/cards/cards-advanced-social.html b/demos/component-docs/cards/cards-advanced-social.html index d1d3576078..250c033a1e 100644 --- a/demos/component-docs/cards/cards-advanced-social.html +++ b/demos/component-docs/cards/cards-advanced-social.html @@ -1,5 +1,5 @@ - + Advanced: Social diff --git a/demos/component-docs/cards/cards-background.html b/demos/component-docs/cards/cards-background.html index 70a9cfd921..6e1be7003c 100644 --- a/demos/component-docs/cards/cards-background.html +++ b/demos/component-docs/cards/cards-background.html @@ -1,5 +1,5 @@ - + Background Images diff --git a/demos/component-docs/cards/cards-basic.html b/demos/component-docs/cards/cards-basic.html index 5ec73bc4a1..c2ef71516c 100644 --- a/demos/component-docs/cards/cards-basic.html +++ b/demos/component-docs/cards/cards-basic.html @@ -1,5 +1,5 @@ - + Basic Cards diff --git a/demos/component-docs/cards/cards-header.html b/demos/component-docs/cards/cards-header.html index 03d857d32b..e7c886ddc9 100644 --- a/demos/component-docs/cards/cards-header.html +++ b/demos/component-docs/cards/cards-header.html @@ -1,5 +1,5 @@ - + Card Headers diff --git a/demos/component-docs/cards/cards-image.html b/demos/component-docs/cards/cards-image.html index 7bacdf1be2..af281c55a3 100644 --- a/demos/component-docs/cards/cards-image.html +++ b/demos/component-docs/cards/cards-image.html @@ -1,5 +1,5 @@ - + Card Images diff --git a/demos/component-docs/cards/cards-list.html b/demos/component-docs/cards/cards-list.html index 5d215eeb85..3cd06a3b92 100644 --- a/demos/component-docs/cards/cards-list.html +++ b/demos/component-docs/cards/cards-list.html @@ -1,5 +1,5 @@ - + Card Lists diff --git a/demos/component-docs/forms/fixed-inline.html b/demos/component-docs/forms/fixed-inline.html index 7f01eb64e6..72f4bd329e 100644 --- a/demos/component-docs/forms/fixed-inline.html +++ b/demos/component-docs/forms/fixed-inline.html @@ -1,4 +1,4 @@ - + Fixed Labels diff --git a/demos/component-docs/forms/floating.html b/demos/component-docs/forms/floating.html index 48e4d9113b..3ec7276d29 100644 --- a/demos/component-docs/forms/floating.html +++ b/demos/component-docs/forms/floating.html @@ -1,4 +1,4 @@ - + Floating Labels diff --git a/demos/component-docs/forms/forms.html b/demos/component-docs/forms/forms.html index 3a2ac65291..8841cd20d1 100644 --- a/demos/component-docs/forms/forms.html +++ b/demos/component-docs/forms/forms.html @@ -1,4 +1,4 @@ - + Forms diff --git a/demos/component-docs/forms/inline.html b/demos/component-docs/forms/inline.html index 3e401bc489..e34f1e83b2 100644 --- a/demos/component-docs/forms/inline.html +++ b/demos/component-docs/forms/inline.html @@ -1,4 +1,4 @@ - + Inline Labels diff --git a/demos/component-docs/forms/inset.html b/demos/component-docs/forms/inset.html index d298c21334..d9903536df 100644 --- a/demos/component-docs/forms/inset.html +++ b/demos/component-docs/forms/inset.html @@ -1,4 +1,4 @@ - + Inset Labels diff --git a/demos/component-docs/forms/placeholder.html b/demos/component-docs/forms/placeholder.html index 18833d875a..573df0123e 100644 --- a/demos/component-docs/forms/placeholder.html +++ b/demos/component-docs/forms/placeholder.html @@ -1,4 +1,4 @@ - + Placeholders diff --git a/demos/component-docs/forms/stacked.html b/demos/component-docs/forms/stacked.html index 0ec1d80ea6..33eba59f1c 100644 --- a/demos/component-docs/forms/stacked.html +++ b/demos/component-docs/forms/stacked.html @@ -1,4 +1,4 @@ - + Stacked Labels diff --git a/demos/component-docs/helpers.ts b/demos/component-docs/helpers.ts index 70f6dceaf1..b3f6795b9a 100644 --- a/demos/component-docs/helpers.ts +++ b/demos/component-docs/helpers.ts @@ -54,6 +54,7 @@ import {TabsPage} from './tabs/tabs'; export class AndroidAttribute { constructor (platform: Platform, elementRef: ElementRef, renderer: Renderer) { + console.log('init'); this.isAndroid = platform.is('android'); renderer.setElementAttribute(elementRef, 'primary', this.isAndroid ? true : null); } diff --git a/demos/component-docs/icons/icons.html b/demos/component-docs/icons/icons.html index 67b4570a41..39df0060eb 100644 --- a/demos/component-docs/icons/icons.html +++ b/demos/component-docs/icons/icons.html @@ -1,5 +1,5 @@ - + Icons diff --git a/demos/component-docs/index.ts b/demos/component-docs/index.ts index e9cbc32a14..cf981e4684 100644 --- a/demos/component-docs/index.ts +++ b/demos/component-docs/index.ts @@ -5,16 +5,17 @@ import * as helpers from './helpers'; @App({ - template: '', - directives: [helpers.AndroidAttribute], + template: '', }) class DemoApp { rootPage: any; + androidAttribute: any; constructor(app: IonicApp, platform: Platform) { this.app = app; this.platform = platform; + this.androidAttribute = helpers.AndroidAttribute; this.platform.ready().then( () => { window.addEventListener('message', (e) => { diff --git a/demos/component-docs/lists/avatar-lists.html b/demos/component-docs/lists/avatar-lists.html index 63cd917038..46ad703097 100644 --- a/demos/component-docs/lists/avatar-lists.html +++ b/demos/component-docs/lists/avatar-lists.html @@ -1,5 +1,5 @@ - + Avatar List diff --git a/demos/component-docs/lists/basic-lists.html b/demos/component-docs/lists/basic-lists.html index f6232fdd13..47d8874c44 100644 --- a/demos/component-docs/lists/basic-lists.html +++ b/demos/component-docs/lists/basic-lists.html @@ -1,5 +1,5 @@ - + Lists diff --git a/demos/component-docs/lists/dividers.html b/demos/component-docs/lists/dividers.html index 02f61edd03..fa75e4ee34 100644 --- a/demos/component-docs/lists/dividers.html +++ b/demos/component-docs/lists/dividers.html @@ -1,5 +1,5 @@ - + Dividers diff --git a/demos/component-docs/lists/icon-lists.html b/demos/component-docs/lists/icon-lists.html index ebce0141c2..74b56b767d 100644 --- a/demos/component-docs/lists/icon-lists.html +++ b/demos/component-docs/lists/icon-lists.html @@ -1,5 +1,5 @@ - + Icon List diff --git a/demos/component-docs/lists/inset-lists.html b/demos/component-docs/lists/inset-lists.html index 2babc27040..5860b3c108 100644 --- a/demos/component-docs/lists/inset-lists.html +++ b/demos/component-docs/lists/inset-lists.html @@ -1,5 +1,5 @@ - + Inset List diff --git a/demos/component-docs/lists/list-headers.html b/demos/component-docs/lists/list-headers.html index 5e5be961b3..3084f6868a 100644 --- a/demos/component-docs/lists/list-headers.html +++ b/demos/component-docs/lists/list-headers.html @@ -1,5 +1,5 @@ - + List Headers diff --git a/demos/component-docs/menus/menu-events.html b/demos/component-docs/menus/menu-events.html index d95d163938..efb9156834 100644 --- a/demos/component-docs/menus/menu-events.html +++ b/demos/component-docs/menus/menu-events.html @@ -1,4 +1,4 @@ - + diff --git a/demos/component-docs/menus/menu-friends.html b/demos/component-docs/menus/menu-friends.html index 10a030378b..372462b42e 100644 --- a/demos/component-docs/menus/menu-friends.html +++ b/demos/component-docs/menus/menu-friends.html @@ -1,6 +1,6 @@ - + - + diff --git a/demos/component-docs/menus/menu-home.html b/demos/component-docs/menus/menu-home.html index 4696694445..2f2bb969d3 100644 --- a/demos/component-docs/menus/menu-home.html +++ b/demos/component-docs/menus/menu-home.html @@ -1,4 +1,4 @@ - + diff --git a/demos/component-docs/menus/menus.html b/demos/component-docs/menus/menus.html index 999f6b0ade..3b8e627395 100644 --- a/demos/component-docs/menus/menus.html +++ b/demos/component-docs/menus/menus.html @@ -1,4 +1,4 @@ - + Menu @@ -12,7 +12,7 @@ {{p.title}} - @@ -21,4 +21,4 @@ - + \ No newline at end of file diff --git a/demos/component-docs/menus/menus.ts b/demos/component-docs/menus/menus.ts index f1992b53b4..61d179fc9b 100644 --- a/demos/component-docs/menus/menus.ts +++ b/demos/component-docs/menus/menus.ts @@ -1,14 +1,11 @@ -import {App, IonicApp, Page, NavController, NavParams} from 'ionic/ionic'; -import {Page, Events} from 'ionic/ionic'; +import {App, IonicApp, Page} from 'ionic/ionic'; import * as helpers from './helpers'; @Page({ templateUrl: 'menus/menu-home.html' }) class PageOne{ - constructor(nav: NavController, events: Events) { - this.nav = nav; - this.events = events; + constructor() { } } @@ -29,10 +26,9 @@ class PageThree{ }) export class MenusPage { - constructor(app: IonicApp, events: Events, nav: NavController) { - this.nav = nav; + constructor(app: IonicApp) { this.app = app; - this.rootView = PageOne; + this.rootPage = PageOne; this.pages = [ { title: 'Home', component: PageOne }, { title: 'Friends', component: PageTwo }, @@ -41,16 +37,13 @@ export class MenusPage { } - onViewWillUnload() { - } - openPage(menu, page) { // close the menu when clicking a link from the menu - menu.close(); + this.app.getComponent('leftMenu').close(); // Reset the content nav to have just this page // we wouldn't want the back button to show in this scenario - // let nav = this.app.getComponent('nav'); - this.nav.setRoot(page.component); + let nav = this.app.getComponent('menuNav'); + nav.setRoot(page.component); } } diff --git a/demos/component-docs/modals/modals.html b/demos/component-docs/modals/modals.html index d24cbb9ab1..2247681de9 100644 --- a/demos/component-docs/modals/modals.html +++ b/demos/component-docs/modals/modals.html @@ -1,5 +1,5 @@ - + Modals diff --git a/demos/component-docs/navigation/navigation-details.html b/demos/component-docs/navigation/navigation-details.html index d278f76b49..d0d59e4fbe 100644 --- a/demos/component-docs/navigation/navigation-details.html +++ b/demos/component-docs/navigation/navigation-details.html @@ -1,5 +1,5 @@ - + {{selection.title}} diff --git a/demos/component-docs/navigation/navigation.html b/demos/component-docs/navigation/navigation.html index 3263158fdf..ed8da16439 100644 --- a/demos/component-docs/navigation/navigation.html +++ b/demos/component-docs/navigation/navigation.html @@ -1,5 +1,5 @@ - + Navigation diff --git a/demos/component-docs/popups/popups.html b/demos/component-docs/popups/popups.html index 4f3960cda6..49204c5565 100644 --- a/demos/component-docs/popups/popups.html +++ b/demos/component-docs/popups/popups.html @@ -1,5 +1,5 @@ - + Popups diff --git a/demos/component-docs/slides/slides.html b/demos/component-docs/slides/slides.html index 08d81d2e51..6243f84dc9 100644 --- a/demos/component-docs/slides/slides.html +++ b/demos/component-docs/slides/slides.html @@ -1,5 +1,5 @@ - + Slides diff --git a/demos/component-docs/tabs/tabs.html b/demos/component-docs/tabs/tabs.html index f69ce0c9d0..1c3e071eea 100644 --- a/demos/component-docs/tabs/tabs.html +++ b/demos/component-docs/tabs/tabs.html @@ -1,4 +1,4 @@ - + Tabs