From 6559a98d4bfa0717a214da4d2be823512173ca31 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Fri, 18 Dec 2015 11:30:26 -0500 Subject: [PATCH] fix(tabs): fix CSS so user can set a color on ion-tabs fixes #776 --- ionic/components/tabs/tabs.ios.scss | 2 +- ionic/components/tabs/tabs.md.scss | 2 +- ionic/components/tabs/tabs.ts | 1 - ionic/components/tabs/test/basic/index.ts | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ionic/components/tabs/tabs.ios.scss b/ionic/components/tabs/tabs.ios.scss index a33c7c636b..14e0a6233c 100644 --- a/ionic/components/tabs/tabs.ios.scss +++ b/ionic/components/tabs/tabs.ios.scss @@ -113,7 +113,7 @@ ion-tabs[tabbarPlacement=top] tabbar { @mixin tabbar-ios($color-name, $color-value) { - tabbar[#{$color-name}] { + ion-tabs[#{$color-name}] tabbar { border-color: darken($color-value, 10%); background-color: $color-value; diff --git a/ionic/components/tabs/tabs.md.scss b/ionic/components/tabs/tabs.md.scss index 5fe0766c7d..0e2aeac82e 100644 --- a/ionic/components/tabs/tabs.md.scss +++ b/ionic/components/tabs/tabs.md.scss @@ -94,7 +94,7 @@ tab-highlight { @mixin tabbar-md($color-name, $color-value) { - tabbar[#{$color-name}] { + ion-tabs[#{$color-name}] tabbar { background-color: $color-value; .tab-button { diff --git a/ionic/components/tabs/tabs.ts b/ionic/components/tabs/tabs.ts index c30838214f..a46b7bae11 100644 --- a/ionic/components/tabs/tabs.ts +++ b/ionic/components/tabs/tabs.ts @@ -16,7 +16,6 @@ import {rafFrames} from '../../util/dom'; * @name Tabs * @property {any} [tabbarPlacement] - set position of the tabbar, top or bottom * @property {any} [tabbarIcons] - set the position of the tabbar's icons: top, bottom, left, right, hide - * @property {any} [tabbar-style] - sets tabbar's style (primary, secondary, etc) * @property {any} [preloadTabs] - sets whether to preload all the tabs, true or false * @usage * ```html diff --git a/ionic/components/tabs/test/basic/index.ts b/ionic/components/tabs/test/basic/index.ts index bf296a3ac4..f44c44e8ba 100644 --- a/ionic/components/tabs/test/basic/index.ts +++ b/ionic/components/tabs/test/basic/index.ts @@ -99,7 +99,7 @@ class Tab3 {} - +