Skip to content

Commit cc0164f

Browse files
committed
Merge remote-tracking branch 'origin/master' into rkaraivanov/defaultValue-feature
2 parents 0058d9b + 401c4b1 commit cc0164f

File tree

5 files changed

+21
-2
lines changed

5 files changed

+21
-2
lines changed

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)