Skip to content

Commit 8ae8fc6

Browse files
authored
Merge branch 'master' into mkirkova/feat-1289
2 parents 5f6b2ac + 401c4b1 commit 8ae8fc6

File tree

10 files changed

+57
-42
lines changed

10 files changed

+57
-42
lines changed

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
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

src/components/card/themes/card.actions.base.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
}
2222
}
2323

24+
:host([orientation='vertical']) {
25+
justify-content: space-around;
26+
}
27+
2428
::slotted([slot='start']) {
2529
display: flex;
2630
align-items: center;

src/components/dialog/themes/shared/dialog.fluent.scss

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@
66
}
77

88
[part='content'] {
9+
@include type-style('body-2') {
10+
margin: 0;
11+
}
12+
913
padding-inline: rem(24px);
10-
padding-block-end: rem(20px);
14+
padding-block: 0 rem(20px);
1115
}
1216

1317
[part='footer'] {
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
import { css } from 'lit';
22

33
import type { Themes } from '../../../theming/types.js';
4+
import { styles as fluent } from './shared/header/dropdown-header.fluent.css.js';
45
// Shared Styles
56
import { styles as indigo } from './shared/header/dropdown-header.indigo.css.js';
67

78
const light = {
89
indigo: css`
910
${indigo}
1011
`,
12+
fluent: css`
13+
${fluent}
14+
`,
1115
};
1216

1317
const dark = {
1418
indigo: css`
1519
${indigo}
1620
`,
21+
fluent: css`
22+
${fluent}
23+
`,
1724
};
1825

1926
export const all: Themes = { light, dark };

src/components/dropdown/themes/shared/dropdown.bootstrap.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,5 @@ $theme: $bootstrap;
99
}
1010

1111
[part='base'] {
12-
padding: rem(8px) 0;
1312
border: rem(1px) solid var-get($theme, 'border-color');
1413
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
@use 'styles/utilities' as *;
2+
3+
:host {
4+
@include type-style('subtitle-2');
5+
}

0 commit comments

Comments
 (0)