diff --git a/ionic/components/navbar/navbar.ts b/ionic/components/navbar/navbar.ts index e717945b28..517ff91d72 100644 --- a/ionic/components/navbar/navbar.ts +++ b/ionic/components/navbar/navbar.ts @@ -82,8 +82,7 @@ class ToolbarBackground { 'class': 'toolbar' }, inputs: [ - 'hideBackButton', - 'navbarStyle' + 'hideBackButton' ], directives: [BackButton, BackButtonText, Icon, ToolbarBackground] }) @@ -100,11 +99,6 @@ export class Navbar extends ToolbarBase { this.app = app; this.renderer = renderer; - let navbarStyle = config.get('navbarStyle'); - if (navbarStyle) { - renderer.setElementAttribute(elementRef, navbarStyle, ''); - } - viewCtrl && viewCtrl.setNavbar(this); this.bbIcon = config.get('backButtonIcon'); @@ -120,10 +114,6 @@ export class Navbar extends ToolbarBase { if (typeof hideBackButton === 'string') { this.hideBackButton = (hideBackButton === '' || hideBackButton === 'true'); } - - if (this.navbarStyle) { - this.renderer.setElementAttribute(this.elementRef, this.navbarStyle, ''); - } } /** diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts index 6febe49b76..0e9c91070c 100644 --- a/ionic/components/tabs/tabs.ts +++ b/ionic/components/tabs/tabs.ts @@ -39,7 +39,6 @@ import {rafFrames} from '../../util/dom'; defaultInputs: { 'tabbarPlacement': 'bottom', 'tabbarIcons': 'top', - 'tabbarStyle': 'default', 'preloadTabs': false }, template: @@ -47,7 +46,7 @@ import {rafFrames} from '../../util/dom'; '' + '' + '' + - '' + + '' + '' + '' + '{{t.tabTitle}}' + diff --git a/ionic/components/tabs/test/basic/index.ts b/ionic/components/tabs/test/basic/index.ts index 5a1209855c..6648d682c1 100644 --- a/ionic/components/tabs/test/basic/index.ts +++ b/ionic/components/tabs/test/basic/index.ts @@ -104,11 +104,7 @@ class Tab3 {} - `, - config: { - navbarStyle: 'secondary', - tabbarStyle: 'secondary' - } + ` }) export class TabsPage { constructor() {