Skip to content

fix(tabs): replace igx-icon with igc-icon in WC demo + fix theme parameters - 20.1.x #16416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: 20.1.x
Choose a base branch
from
+43 −31
Open

fix(tabs): replace igx-icon with igc-icon in WC demo + fix theme parameters - 20.1.x #16416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a6cbc7c
fix(tabs): change icon in WC demo to be igc-icon, instead of igx-icon
adrianptrv Oct 29, 2025
bdd6bb1
fix(tabs): material border-radius not working + move background from …
adrianptrv Nov 2, 2025
e5867ac
chore(tabs): formatting
adrianptrv Nov 2, 2025
7d52506
Merge branch '20.1.x' into apetrov/fix-tabs-demo-icon-20.1.x
simeonoff Nov 10, 2025
b0a7c82
Merge branch '20.1.x' into apetrov/fix-tabs-demo-icon-20.1.x
simeonoff Nov 10, 2025
f26a4da
Merge branch '20.1.x' into apetrov/fix-tabs-demo-icon-20.1.x
simeonoff Nov 10, 2025
77122a3
feat(tabs): set up the newly added 'active' theme parameters
adrianptrv Nov 10, 2025
b62b2ed
chore(tabs): remove unnecessary code
adrianptrv Nov 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 34 additions & 29 deletions projects/igniteui-angular/src/lib/core/styles/components/tabs/_tabs-theme.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,23 @@
%tabs-header {
overflow: hidden;
flex: 0 0 auto;
background: var-get($theme, 'item-background');
z-index: 1;

@if $bootstrap-theme {
position: relative;

&::after {
content: '';
position: absolute;
bottom: 0;
inset-inline-start: 0;
width: 100%;
height: rem(1px);
background: var-get($theme, 'border-color');
z-index: 0;
}
}
@if $bootstrap-theme {
position: relative;
background: var-get($theme, 'item-background');

&::after {
content: '';
position: absolute;
bottom: 0;
inset-inline-start: 0;
width: 100%;
height: rem(1px);
background: var-get($theme, 'border-color');
z-index: 0;
}
}
}

%tabs-header-content {
Expand Down Expand Up @@ -204,6 +204,7 @@
@if $not-bootstrap-theme {
transition: all .3s $tabs-animation-function;
border: rem(1px) solid var-get($theme, 'border-color');
border-radius: var-get($theme, 'border-radius');

&:hover,
&:focus {
Expand Down Expand Up @@ -240,7 +241,7 @@
}

&:focus {
background: var-get($theme, 'item-active-background');
background: var-get($theme, 'item-hover-background');
color: var-get($theme, 'item-hover-color');
border-bottom-color: transparent;
}
Expand Down Expand Up @@ -268,14 +269,15 @@
%tabs-header-item--selected {
outline: 0;
color: var-get($theme, 'item-active-color');
background: var-get($theme, 'item-active-background');

&:hover,
&:focus {
background: var-get($theme, 'item-active-background');
color: if($variant == 'fluent', var-get($theme, 'item-hover-color'), var-get($theme, 'item-active-color'));
background: var-get($theme, 'item-active-hover-background');
color: var-get($theme, 'item-active-hover-color');

igx-icon {
color: var-get($theme, 'item-active-icon-color');
color: var-get($theme, 'item-active-hover-icon-color');
}
}

Expand All @@ -284,7 +286,6 @@
}

@if $bootstrap-theme {
background: var-get($theme, 'item-active-background');
position: relative;
box-shadow: inset 0 0 0 rem(1px) var-get($theme, 'border-color');
z-index: 1;
Expand All @@ -310,6 +311,16 @@

&:hover {
box-shadow: inset 0 0 0 rem(1px) var-get($theme, 'border-color');

&::before {
background: linear-gradient(
to right,
var-get($theme, 'border-color') 1px,
var-get($theme, 'item-active-hover-background') 1px,
var-get($theme, 'item-active-hover-background') calc(100% - 1px),
var-get($theme, 'border-color') calc(100% - 1px)
);
}
}
}

Expand All @@ -318,21 +329,15 @@
font-weight: 600;
}
}

@if $indigo-theme {
&:hover,
&:focus-within {
background: var-get($theme, 'item-hover-background');
}
}
}

%tabs-header-item:focus,
%tabs-header-item--selected:focus {
@if $bootstrap-theme {
border: none;
box-shadow: inset 0 0 0 rem(2px) var-get($theme, 'item-hover-color');
border-radius: rem(4px);
box-shadow: inset 0 0 0 rem(2px) var-get($theme, 'item-active-hover-color');
border-bottom-left-radius: rem(4px);
border-bottom-right-radius: rem(4px);
z-index: 1;

&::after {
Expand Down
2 changes: 1 addition & 1 deletion src/app/tabs-showcase/tabs-showcase.sample.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
@for (contact of contacts; track contact.id) {
<igc-tab [selected]="contact.id === selectedTabId">
@if(!properties.hideIcon) {
<igx-icon slot="label">folder</igx-icon>
<igc-icon name="folder" slot="label"></igc-icon>
}
@if(!properties.hideText) {
<span slot="label">{{ contact.text }}</span>
Expand Down
9 changes: 8 additions & 1 deletion src/app/tabs-showcase/tabs-showcase.sample.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,20 @@ import {
defineComponents,
IgcTabsComponent,
IgcTabComponent,
IgcIconComponent,
registerIconFromText
} from 'igniteui-webcomponents';
import {
PropertyChangeService,
Properties,
} from '../properties-panel/property-change.service';

defineComponents(IgcTabsComponent, IgcTabComponent);
defineComponents(IgcTabsComponent, IgcTabComponent, IgcIconComponent);

registerIconFromText(
'folder',
'<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px"><path d="M160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h240l80 80h320q33 0 56.5 23.5T880-640v400q0 33-23.5 56.5T800-160H160Z"/></svg>'
);

@Component({
selector: 'app-tabs-showcase-sample',
Expand Down
Loading