Skip to content

Commit 3363a20

Browse files
committed
Merge remote-tracking branch 'origin/master' into rkaraivanov/defaultValue-feature
2 parents caf9db7 + c6dfcb7 commit 3363a20

File tree

5 files changed

+41
-45
lines changed

5 files changed

+41
-45
lines changed

package-lock.json

Lines changed: 36 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@
8282
"globby": "^14.0.2",
8383
"husky": "^9.1.6",
8484
"ig-typedoc-theme": "^5.0.4",
85-
"igniteui-theming": "^14.1.2",
85+
"igniteui-theming": "^14.2.0",
8686
"keep-a-changelog": "^2.5.3",
8787
"lint-staged": "^15.2.10",
8888
"lit-analyzer": "^2.0.3",
8989
"madge": "^8.0.0",
9090
"node-watch": "^0.7.4",
9191
"playwright": "^1.48.2",
92-
"postcss": "^8.4.48",
92+
"postcss": "^8.4.49",
9393
"prettier": "^3.3.3",
9494
"rimraf": "^5.0.10",
9595
"sass": "^1.78.0",
@@ -99,13 +99,13 @@
9999
"stylelint": "^16.10.0",
100100
"stylelint-config-standard-scss": "^13.1.0",
101101
"stylelint-prettier": "^5.0.2",
102-
"stylelint-scss": "^6.8.1",
102+
"stylelint-scss": "^6.9.0",
103103
"ts-lit-plugin": "^2.0.2",
104104
"tslib": "^2.8.1",
105105
"typedoc": "^0.26.11",
106106
"typedoc-plugin-localization": "^3.0.5",
107107
"typescript": "^5.6.3",
108-
"vite": "^5.4.10"
108+
"vite": "^5.4.11"
109109
},
110110
"browserslist": [
111111
"defaults"

src/components/badge/themes/badge.base.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,22 +34,18 @@
3434

3535
:host([variant='info']) [part='base'] {
3636
background: color(info, 500);
37-
color: contrast-color(info, 500);
3837
}
3938

4039
:host([variant='success']) [part='base'] {
4140
background: color(success, 500);
42-
color: contrast-color(success, 500);
4341
}
4442

4543
:host([variant='warning']) [part='base'] {
4644
background: color(warn, 500);
47-
color: contrast-color(warn, 500);
4845
}
4946

5047
:host([variant='danger']) [part='base'] {
5148
background: color(error, 500);
52-
color: contrast-color(error, 500);
5349
}
5450

5551
:host([shape='rounded']),

src/components/badge/themes/shared/badge.common.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ $theme: $material;
55

66
[part='base'] {
77
box-shadow: var-get($theme, 'elevation');
8+
color: var-get($theme, 'text-color');
89
}
910

1011
::slotted(igc-icon) {
@@ -13,7 +14,6 @@ $theme: $material;
1314

1415
:host([variant='primary']) [part='base'] {
1516
background: var-get($theme, 'background-color');
16-
color: var-get($theme, 'text-color');
1717
}
1818

1919
:host([shape='square']) [part='base'] {

src/components/badge/themes/shared/badge.indigo.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@
33

44
$theme: $indigo;
55

6-
:host([variant='info']),
7-
:host([variant='success']),
8-
:host([variant='warning']),
9-
:host([variant='danger']) {
10-
color: var-get($theme, 'text-color');
11-
}
12-
136
[part='base'] {
147
@include type-style('button');
158

0 commit comments

Comments
 (0)