diff --git a/ionic/components/tabs/tab-button.ts b/ionic/components/tabs/tab-button.ts index 2f632700f9..33fd420d0c 100644 --- a/ionic/components/tabs/tab-button.ts +++ b/ionic/components/tabs/tab-button.ts @@ -29,6 +29,7 @@ export class TabButton extends Ion { private hasTitleOnly: boolean; private hasIconOnly: boolean; private hasBadge: boolean; + private _layout: string; @Input() tab: Tab; @Output() select: EventEmitter = new EventEmitter(); @@ -36,12 +37,15 @@ export class TabButton extends Ion { constructor(config: Config, elementRef: ElementRef) { super(elementRef); this.disHover = (config.get('hoverCSS') === false); + this._layout = config.get('tabbarLayout'); } ngOnInit() { this.tab.btn = this; + this._layout = this.tab.parent.tabbarLayout || this._layout; + this.hasTitle = !!this.tab.tabTitle; - this.hasIcon = !!this.tab.tabIcon; + this.hasIcon = !!this.tab.tabIcon && this._layout != 'icon-hide'; this.hasTitleOnly = (this.hasTitle && !this.hasIcon); this.hasIconOnly = (this.hasIcon && !this.hasTitle); this.hasBadge = !!this.tab.tabBadge; diff --git a/ionic/components/tabs/tabs.scss b/ionic/components/tabs/tabs.scss index c44040e79e..7d5866ceba 100644 --- a/ionic/components/tabs/tabs.scss +++ b/ionic/components/tabs/tabs.scss @@ -159,7 +159,6 @@ tab-highlight { right: calc(50% - 30px); } -[tabbarLayout=icon-hide] .tab-badge, [tabbarLayout=icon-bottom] .tab-badge, [tabbarLayout=icon-left] .tab-badge, [tabbarLayout=icon-right] .tab-badge { diff --git a/ionic/components/tabs/test/badges/main.html b/ionic/components/tabs/test/badges/main.html index 521d7607c8..04a8e72bd2 100644 --- a/ionic/components/tabs/test/badges/main.html +++ b/ionic/components/tabs/test/badges/main.html @@ -32,7 +32,7 @@ - + @@ -45,6 +45,21 @@ + + + + + + + + + + + + + + + diff --git a/ionic/components/tabs/test/tab-bar-scenarios/main.html b/ionic/components/tabs/test/tab-bar-scenarios/main.html index e71c0bd045..1859495ac2 100644 --- a/ionic/components/tabs/test/tab-bar-scenarios/main.html +++ b/ionic/components/tabs/test/tab-bar-scenarios/main.html @@ -56,7 +56,7 @@ - +