From 1f06b58bf5862ab17c1d5a4de264c56992552d35 Mon Sep 17 00:00:00 2001 From: kiran Date: Mon, 8 Dec 2014 19:42:47 +0530 Subject: [PATCH 1/2] Fixed hard coding of tab-title-background-active value --- docs/templates/tabs.html | 2 +- scss/_settings.scss | 2 +- scss/components/_tabs.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/templates/tabs.html b/docs/templates/tabs.html index 3b8b6098..eef9f844 100644 --- a/docs/templates/tabs.html +++ b/docs/templates/tabs.html @@ -138,7 +138,7 @@

Sass Variables

$tab-title-background: #f4f4f4; $tab-title-background-hover: smartscale($tab-title-background, 5%); -$tab-title-background-active: #fff; +$tab-title-background-active: smartscale($tab-title-background, 3%); $tab-title-color: isitlight($tab-title-background); $tab-title-color-active: $tab-title-color; diff --git a/scss/_settings.scss b/scss/_settings.scss index ef704551..b8a347ed 100644 --- a/scss/_settings.scss +++ b/scss/_settings.scss @@ -567,7 +567,7 @@ $include-css: ( // $tab-title-background: $gray-light; // $tab-title-background-hover: smartscale($tab-title-background, 5%); -// $tab-title-background-active: lighten($gray-light, 2); +// $tab-title-background-active: smartscale($tab-title-background, 3%); // $tab-title-color: isitlight($tab-title-background); // $tab-title-color-active: $tab-title-color; diff --git a/scss/components/_tabs.scss b/scss/components/_tabs.scss index 6db1bd3b..48d83cd4 100644 --- a/scss/components/_tabs.scss +++ b/scss/components/_tabs.scss @@ -7,7 +7,7 @@ $tabstrip-background: transparent !default; $tab-title-background: $gray-light !default; $tab-title-background-hover: smartscale($tab-title-background, 5%) !default; -$tab-title-background-active: lighten($gray-light, 2) !default; +$tab-title-background-active: smartscale($tab-title-background, 3%) !default; $tab-title-color: isitlight($tab-title-background) !default; $tab-title-color-active: $tab-title-color !default; From 2480e72b7f7db9fee81264a73378af1b67ec8456 Mon Sep 17 00:00:00 2001 From: kiran Date: Mon, 8 Dec 2014 19:45:16 +0530 Subject: [PATCH 2/2] Fixed hover effect on active tab item --- scss/components/_tabs.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scss/components/_tabs.scss b/scss/components/_tabs.scss index 48d83cd4..b9aafeb9 100644 --- a/scss/components/_tabs.scss +++ b/scss/components/_tabs.scss @@ -53,7 +53,7 @@ $tab-content-padding: $global-padding !default; color: $color-active; &:hover { - background: $background-active; + background: $background-hover; } } &:hover {