From 795e9f3dd33345d4103eb9e20b81d93b981d571d Mon Sep 17 00:00:00 2001 From: cmajorsmith Date: Sat, 18 Aug 2018 16:50:57 +0300 Subject: [PATCH 1/2] fix(tabset): hovering a tab doesn't affect the other tabs (#540) --- .../components/tabset/_tabset.component.theme.scss | 11 +++++++++++ .../theme/components/tabset/tabset.component.ts | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/framework/theme/components/tabset/_tabset.component.theme.scss b/src/framework/theme/components/tabset/_tabset.component.theme.scss index cdcfb63003..668419d310 100644 --- a/src/framework/theme/components/tabset/_tabset.component.theme.scss +++ b/src/framework/theme/components/tabset/_tabset.component.theme.scss @@ -29,6 +29,17 @@ padding: nb-theme(tabs-padding); color: nb-theme(tabs-fg); + span { + &::before { + content: attr(data-title); + display: block; + height: 1px; + visibility: hidden; + + font-weight: nb-theme(tabs-active-font-weight); + } + } + &:hover { color: nb-theme(tabs-fg-heading); font-weight: nb-theme(tabs-active-font-weight); diff --git a/src/framework/theme/components/tabset/tabset.component.ts b/src/framework/theme/components/tabset/tabset.component.ts index 1f99674914..47b111e7ae 100644 --- a/src/framework/theme/components/tabset/tabset.component.ts +++ b/src/framework/theme/components/tabset/tabset.component.ts @@ -188,7 +188,7 @@ export class NbTabComponent { [class.active]="tab.active"> - {{ tab.tabTitle }} + {{ tab.tabTitle }} Date: Fri, 24 Aug 2018 00:53:59 +0300 Subject: [PATCH 2/2] fix(tabset): removes bold emphasize for hovered tab --- .../route-tabset/_route-tabset.component.theme.scss | 1 - .../components/tabset/_tabset.component.theme.scss | 12 ------------ .../theme/components/tabset/tabset.component.ts | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/framework/theme/components/route-tabset/_route-tabset.component.theme.scss b/src/framework/theme/components/route-tabset/_route-tabset.component.theme.scss index abc84cdf8b..ac8ecf3310 100644 --- a/src/framework/theme/components/route-tabset/_route-tabset.component.theme.scss +++ b/src/framework/theme/components/route-tabset/_route-tabset.component.theme.scss @@ -31,7 +31,6 @@ &:hover { color: nb-theme(route-tabs-fg-heading); - font-weight: nb-theme(route-tabs-active-font-weight); } &::before { diff --git a/src/framework/theme/components/tabset/_tabset.component.theme.scss b/src/framework/theme/components/tabset/_tabset.component.theme.scss index 668419d310..37eddd3e79 100644 --- a/src/framework/theme/components/tabset/_tabset.component.theme.scss +++ b/src/framework/theme/components/tabset/_tabset.component.theme.scss @@ -29,20 +29,8 @@ padding: nb-theme(tabs-padding); color: nb-theme(tabs-fg); - span { - &::before { - content: attr(data-title); - display: block; - height: 1px; - visibility: hidden; - - font-weight: nb-theme(tabs-active-font-weight); - } - } - &:hover { color: nb-theme(tabs-fg-heading); - font-weight: nb-theme(tabs-active-font-weight); } &::before { diff --git a/src/framework/theme/components/tabset/tabset.component.ts b/src/framework/theme/components/tabset/tabset.component.ts index 47b111e7ae..1f99674914 100644 --- a/src/framework/theme/components/tabset/tabset.component.ts +++ b/src/framework/theme/components/tabset/tabset.component.ts @@ -188,7 +188,7 @@ export class NbTabComponent { [class.active]="tab.active"> - {{ tab.tabTitle }} + {{ tab.tabTitle }}