From 6a480fd79197cd0d6d97a3538458d2d650de9e6d Mon Sep 17 00:00:00 2001 From: Thomas Burleson Date: Fri, 8 Apr 2016 16:29:46 -0500 Subject: [PATCH] Revert "fix(tabs): not selected tab text color as spec" This reverts commit ccfef921531256e38d820e5fed9d6fad2445554a. --- src/components/tabs/tabs-theme.scss | 78 +++++++++++++++++++++-------- 1 file changed, 56 insertions(+), 22 deletions(-) diff --git a/src/components/tabs/tabs-theme.scss b/src/components/tabs/tabs-theme.scss index b9f163b1b44..1229dd2e50b 100644 --- a/src/components/tabs/tabs-theme.scss +++ b/src/components/tabs/tabs-theme.scss @@ -1,22 +1,68 @@ -@mixin md-tab-theme($theme) { +@mixin md-tab-primary { > md-tabs-wrapper { - background-color: '{{#{$theme}-color}}'; + background-color: '{{primary-color}}'; > md-tabs-canvas { > md-pagination-wrapper { > md-tab-item:not([disabled]) { + color: '{{primary-100}}'; &.md-active, &.md-focused { &, md-icon { - color: '{{#{$theme}-contrast}}'; + color: '{{primary-contrast}}'; } } &.md-focused { - background: '{{#{$theme}-contrast-0.1}}'; + background: '{{primary-contrast-0.1}}'; } } } } } } +@mixin md-tab-warn { + > md-tabs-wrapper { + background-color: '{{warn-color}}'; + > md-tabs-canvas { + > md-pagination-wrapper { + > md-tab-item:not([disabled]) { + color: '{{warn-100}}'; + &.md-active, &.md-focused { + &, md-icon { + color: '{{warn-contrast}}'; + } + } + &.md-focused { + background: '{{warn-contrast-0.1}}'; + } + } + } + } + } +} +@mixin md-tab-accent { + > md-tabs-wrapper { + background-color: '{{accent-color}}'; + > md-tabs-canvas { + > md-pagination-wrapper { + > md-tab-item:not([disabled]) { + color: '{{accent-A100}}'; + &.md-active, &.md-focused { + &, md-icon { + color: '{{accent-contrast}}'; + } + } + &.md-focused { + background: '{{accent-contrast-0.1}}'; + } + } + > md-ink-bar { + color: '{{primary-600-1}}'; + background: '{{primary-600-1}}'; + } + } + } + } + +} md-tabs.md-THEME_NAME-theme { md-tabs-wrapper { background-color: transparent; @@ -51,37 +97,25 @@ md-tabs.md-THEME_NAME-theme { } } - &.md-accent, &.md-primary, &.md-warn{ - > md-tabs-wrapper { - > md-tabs-canvas { - > md-pagination-wrapper { - > md-tab-item:not([disabled]) { - color: rgba(255, 255, 255, 0.7); - } - } - } - } - } - &.md-accent { - @include md-tab-theme('accent'); + @include md-tab-accent(); } &.md-primary { - @include md-tab-theme('primary'); + @include md-tab-primary(); } &.md-warn { - @include md-tab-theme('warn'); + @include md-tab-warn(); } } md-toolbar > md-tabs.md-THEME_NAME-theme { - @include md-tab-theme('primary'); + @include md-tab-primary(); } md-toolbar.md-accent > md-tabs.md-THEME_NAME-theme { - @include md-tab-theme('accent'); + @include md-tab-accent(); } md-toolbar.md-warn > md-tabs.md-THEME_NAME-theme { - @include md-tab-theme('warn'); + @include md-tab-warn(); }