From f2db74ba692c0a5743d6757a37377ee1d5ee5559 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Fri, 5 Feb 2016 13:55:06 -0600 Subject: [PATCH] fix(tabs): show navbar on second page in tab --- ionic/components/navbar/navbar.ts | 7 ------- ionic/components/tabs/tabs.scss | 10 ---------- 2 files changed, 17 deletions(-) diff --git a/ionic/components/navbar/navbar.ts b/ionic/components/navbar/navbar.ts index f0c4db285a..ff5ce24c91 100644 --- a/ionic/components/navbar/navbar.ts +++ b/ionic/components/navbar/navbar.ts @@ -107,7 +107,6 @@ class ToolbarBackground { '', host: { '[hidden]': '_hidden', - '[class.show-tab-navbar]': '_showNavbar', 'class': 'toolbar' }, directives: [BackButton, BackButtonText, Icon, ToolbarBackground] @@ -119,7 +118,6 @@ export class Navbar extends ToolbarBase { private _bbRef: ElementRef; private _bbtRef: ElementRef; private _bgRef: ElementRef; - private _showNavbar: boolean; /** * @private @@ -217,11 +215,6 @@ export class Navbar extends ToolbarBase { setHidden(isHidden: boolean) { // used to display none/block the navbar this._hidden = isHidden; - - // on the very first load, the navbar may load quicker than - // the tab content, which looks weird. This makes sure that - // the tab's navbar doesn't show before the tab has fully loaded - this._showNavbar = !isHidden; } } diff --git a/ionic/components/tabs/tabs.scss b/ionic/components/tabs/tabs.scss index 30e9b2c3fc..535ae3d866 100644 --- a/ionic/components/tabs/tabs.scss +++ b/ionic/components/tabs/tabs.scss @@ -38,16 +38,6 @@ ion-tabs > ion-navbar-section { order: $flex-order-tabbar-navbar; } -ion-tabs > ion-navbar-section ion-navbar.toolbar.show-navbar { - // by default, do not show tab navbars when they render - opacity: 0; -} - -ion-tabs > ion-navbar-section ion-navbar.toolbar.show-navbar.show-tab-navbar { - // only when the tab content has loaded should it be rendered - opacity: 1; -} - ion-tabbar-section { position: relative; order: $flex-order-tabbar-bottom;