Skip to content

Commit 7f4b09c

Browse files
authored
Fluent: QoL improvements (#5327)
* Check CI * Try again * Minify on test * Better short-term fix * Remove debug * Better wording * Changelog
1 parent 4744d69 commit 7f4b09c

File tree

7 files changed

+20
-10
lines changed

7 files changed

+20
-10
lines changed

CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
8484
- Fixes [#5306](https://github.com/microsoft/BotFramework-WebChat/issues/5306). Title and subtitle in pre-chat message activity should wrap, in PR [#5307](https://github.com/microsoft/BotFramework-WebChat/pull/5307), by [@compulim](https://github.com/compulim)
8585
- Fixes [#5319](https://github.com/microsoft/BotFramework-WebChat/issues/5319). Some Markdown text are not rendered after HTML tags, in PR [#5320](https://github.com/microsoft/BotFramework-WebChat/pull/5320), by [@compulim](https://github.com/compulim)
8686
- Fixes [#5323](https://github.com/microsoft/BotFramework-WebChat/issues/5323). Removed unused CSS class from carousel component, eliminating unintended styling, in PR [#5325](https://github.com/microsoft/BotFramework-WebChat/pull/5325), by [@OEvgeny](https://github.com/OEvgeny)
87-
- Resolved CSS class name conflicts between component and fluent packages to prevent styling issues, in PR [#5326](https://github.com/microsoft/BotFramework-WebChat/pull/5326), by [@OEvgeny](https://github.com/OEvgeny)
87+
- Resolved CSS class name conflicts between component and fluent packages to prevent styling issues, in PR [#5326](https://github.com/microsoft/BotFramework-WebChat/pull/5326), in PR [#5327](https://github.com/microsoft/BotFramework-WebChat/pull/5327), by [@OEvgeny](https://github.com/OEvgeny)
8888

8989
# Removed
9090

docker-compose-wsl2.yml

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ services:
4848
- ./packages/test/fluent-bundle/dist/:/var/web/packages/test/fluent-bundle/dist/
4949
- ./packages/test/harness/dist/:/var/web/packages/test/harness/dist/
5050
- ./packages/test/page-object/dist/:/var/web/packages/test/page-object/dist/
51+
ports:
52+
- '5081:80'
5153

5254
jest-server:
5355
build:

packages/component/src/decorator/private/BorderFlair.module.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
}
8787
}
8888

89-
:global(.webchat) .border-flair:global(.border-flair) {
89+
:global(.webchat) .border-flair {
9090
/* Configurable variables */
9191
--webchat-decorator-borderFlair-color1: var(--webchat-borderFlair-color1, var(--webchat__border-animation--color-1));
9292
--webchat-decorator-borderFlair-color2: var(--webchat-borderFlair-color2, var(--webchat__border-animation--color-2));
@@ -126,7 +126,7 @@
126126
position: absolute;
127127
}
128128

129-
:global(.webchat) .border-flair--complete:global(.border-flair--complete) {
129+
:global(.webchat) .border-flair--complete {
130130
animation-play-state: paused;
131131
}
132132

@@ -538,7 +538,7 @@
538538
}
539539
}
540540

541-
:global(.webchat) .border-flair:global(.border-flair) {
541+
:global(.webchat) .border-flair {
542542
--webchat-decorator-borderFlair-animated-angle: calc(0.75 + 2 * var(--webchat-decorator-borderFlair-animated));
543543
--webchat-decorator-borderFlair-animated-color1: color-mix(
544544
in srgb,

packages/component/src/decorator/private/BorderLoader.module.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
}
1111
}
1212

13-
:global(.webchat) .border-loader:global(.border-loader) {
13+
:global(.webchat) .border-loader {
1414
border-radius: inherit;
1515
}
1616

17-
:global(.webchat) .border-loader__track:global(.border-loader__track) {
17+
:global(.webchat) .border-loader__track {
1818
--webchat-decorator-borderLoader-borderSize: var(--webchat-borderLoader-borderSize, 4px);
1919

2020
background-color: var(--webchat-colorNeutralBackground6, #e6e6e6);
@@ -23,7 +23,7 @@
2323
width: 100%;
2424
}
2525

26-
:global(.webchat) .border-loader__loader:global(.border-loader__loader) {
26+
:global(.webchat) .border-loader__loader {
2727
--webchat-decorator-borderLoader-color1: var(--webchat-borderLoader-color1, var(--webchat__border-animation--color-1));
2828
--webchat-decorator-borderLoader-color2: var(--webchat-borderLoader-color2, var(--webchat__border-animation--color-2));
2929
--webchat-decorator-borderLoader-color3: var(--webchat-borderLoader-color3, var(--webchat__border-animation--color-3));

packages/fluent-theme/src/components/activity/ActivityDecorator.module.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@
8888
margin-inline-start: 28px;
8989
}
9090

91-
:global(.border-loader):global(.border-loader) {
91+
:global(.border-loader) {
9292
display: flex;
9393
flex-flow: column nowrap;
9494
gap: var(--webchat-spacingVerticalS);
9595
padding-inline-end: var(--webchat-spacingHorizontalM);
9696
width: 500px;
9797
}
9898

99-
:global(.border-loader__track):global(.border-loader__track) {
99+
:global(.border-loader__track) {
100100
border-radius: inherit;
101101
box-sizing: border-box;
102102
clip-path: border-box;

packages/fluent-theme/src/components/theme/Theme.module.css

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
:global {
2+
/* biome-ignore format: do not print each class on the new line */
3+
.a, .b, .c, .d, .e, .f, .g, .h, .i, .j, .k, .l, .m, .n, .o, .p, .q, .r, .s, .t, .v, .w, .u, .x, .y, .z,
4+
.A, .B, .C, .D, .E, .F, .G, .H, .I, .J, .K, .L, .M, .N, .O, .P, .Q, .R, .S, .T, .V, .W, .U, .X, .Y, .Z {
5+
/* biome-ignore lint: esbuild considers empty global classes as used and removes them due to lack of rules */
6+
}
7+
}
8+
19
:global(.webchat-fluent).theme {
210
display: contents;
311

tsup.base.config.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ const baseConfig: Options & { target: Target[] } = {
5151
format: 'esm',
5252
loader: { '.js': 'jsx' },
5353
metafile: true,
54-
minify: env === 'production',
54+
minify: env === 'production' || env === 'test',
5555
platform: 'browser',
5656
sourcemap: true,
5757
splitting: true,

0 commit comments

Comments
 (0)