Skip to content

Commit 7b67505

Browse files
committed
refactor(button): refactor button themes
1 parent 0966885 commit 7b67505

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

projects/igniteui-angular/core/src/core/styles/components/button/_button-theme.scss

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -525,17 +525,19 @@
525525
border-color: var-get($outlined-theme, 'focus-visible-border-color');
526526

527527
igx-icon {
528-
color: var-get($outlined-theme, 'focus-visible-foreground');
528+
color: var-get($outlined-theme, 'icon-color');
529+
}
530+
531+
@if $variant == 'material' {
532+
igx-icon {
533+
color: var-get($outlined-theme, 'icon-color-hover');
534+
}
529535
}
530536

531537
@if $variant == 'bootstrap' {
532538
box-shadow: 0 0 0 rem(4px) var-get($outlined-theme, 'shadow-color');
533539
} @else if $variant == 'indigo' {
534540
box-shadow: 0 0 0 rem(3px) var-get($outlined-theme, 'shadow-color');
535-
536-
igx-icon {
537-
color: var-get($outlined-theme, 'icon-color');
538-
}
539541
}
540542

541543
&:hover {
@@ -551,15 +553,10 @@
551553
&:active {
552554
background: var-get($outlined-theme, 'focus-background');
553555
color: var-get($outlined-theme, 'focus-foreground');
556+
border-color: var-get($outlined-theme, 'focus-border-color');
554557

555-
@if $variant == 'material' {
556-
border-color: var-get($outlined-theme, 'focus-border-color');
557-
558-
igx-icon {
559-
color: var-get($outlined-theme, 'focus-foreground');
560-
}
561-
} @else {
562-
border-color: var-get($outlined-theme, 'active-border-color');
558+
igx-icon {
559+
color: var-get($outlined-theme, 'focus-foreground');
563560
}
564561

565562
@if $variant == 'indigo' {
@@ -681,6 +678,11 @@
681678
&:active {
682679
color: var-get($contained-theme, 'focus-foreground');
683680
background: var-get($contained-theme, 'focus-background');
681+
border-color: var-get($contained-theme, 'focus-border-color');
682+
683+
igx-icon {
684+
color: var-get($contained-theme, 'focus-foreground');
685+
}
684686

685687
@if $variant == 'indigo' {
686688
igx-icon {
@@ -818,6 +820,11 @@
818820
&:active {
819821
background: var-get($fab-theme, 'focus-background');
820822
color: var-get($fab-theme, 'focus-foreground');
823+
border-color: var-get($fab-theme, 'focus-border-color');
824+
825+
igx-icon {
826+
color: var-get($contained-theme, 'focus-foreground');
827+
}
821828

822829
@if $variant == 'indigo' {
823830
igx-icon {

0 commit comments

Comments
 (0)