Skip to content

fix: copilot variant adaptive card double padding #5656

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OEvgeny merged 3 commits into from
Dec 16, 2025
Merged

fix: copilot variant adaptive card double padding #5656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
414e5aa
fix: copilot variant adaptive card double padding
OEvgeny Dec 16, 2025
97322c3
Changelog
OEvgeny Dec 16, 2025
3722f68
fix formatting
OEvgeny Dec 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Notes: web developers are advised to use [`~` (tilde range)](https://github.com/
- Added target to Chrome 100 and re-enable Lightning CSS for ESM builds, by [@compulim](https://github.com/compulim) in PR [#5602](https://github.com/microsoft/BotFramework-WebChat/pull/5602)
- Relaxed `role` prop to allow any string instead of ARIA landmark roles, in PR [#5561](https://github.com/microsoft/BotFramework-WebChat/pull/5561), by [@compulim](https://github.com/compulim)
- Cleaned up `<ThemeProvider>` and various CSS related code, in PR [#5611](https://github.com/microsoft/BotFramework-WebChat/pull/5611), by [@compulim](https://github.com/compulim)
- (Experimental) Reworked the copilot variant to align with the modern Copilot UX, in PR [#5630](https://github.com/microsoft/BotFramework-WebChat/pull/5630), by [@OEvgeny](https://github.com/OEvgeny), in PR [#5634](https://github.com/microsoft/BotFramework-WebChat/pull/5634), by [@OEvgeny](https://github.com/OEvgeny)
- (Experimental) Reworked the copilot variant to align with the modern Copilot UX, in PR [#5630](https://github.com/microsoft/BotFramework-WebChat/pull/5630), by [@OEvgeny](https://github.com/OEvgeny), in PR [#5634](https://github.com/microsoft/BotFramework-WebChat/pull/5634), by [@OEvgeny](https://github.com/OEvgeny), in PR [#5656](https://github.com/microsoft/BotFramework-WebChat/pull/5656), by [@OEvgeny](https://github.com/OEvgeny)
- Added loading animation for `copilot`, and `fluent` variants
- New JSON-LD graph backend, by [@compulim](https://github.com/compulim) in PR [#5622](https://github.com/microsoft/BotFramework-WebChat/pull/5622)

Expand Down
10 changes: 10 additions & 0 deletions __tests__/html2/markdown/codeBlockCopyButton/adaptiveCards/layout.copilot.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<!doctype html>
<html>
<head>
<title>Adaptive Card Layout - Copy Button (copilot)</title>
<script>
location = './layout?theme=fluent&variant=copilot';
</script>
</head>
<body></body>
</html>
Binary file added ...html2/markdown/codeBlockCopyButton/adaptiveCards/layout.copilot.html.snap-1.png
View file
Open in desktop
Comment thread
compulim marked this conversation as resolved.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion __tests__/html2/markdown/codeBlockCopyButton/adaptiveCards/layout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
<!doctype html>
<html lang="en-US">
<head>
<title>Adaptive Card Layout - Copy Button</title>
<link href="/assets/index.css" rel="stylesheet" type="text/css" />
<script crossorigin="anonymous" src="https://unpkg.com/react@16.8.6/umd/react.production.min.js"></script>
<script crossorigin="anonymous" src="https://unpkg.com/react-dom@16.8.6/umd/react-dom.production.min.js"></script>
<script crossorigin="anonymous" src="/test-harness.js"></script>
<script crossorigin="anonymous" src="/test-page-object.js"></script>
<script crossorigin="anonymous" src="/__dist__/webchat-es5.js"></script>
<script crossorigin="anonymous" src="/__dist__/botframework-webchat-fluent-theme.production.min.js"></script>
</head>

<body>
Expand All @@ -22,7 +26,7 @@
);

const {
WebChat: { renderWebChat, testIds }
WebChat: { testIds }
} = window; // Imports in UMD fashion.

const { directLine, store } = testHelpers.createDirectLineEmulator();
Expand Down
6 changes: 6 additions & 0 deletions packages/fluent-theme/src/components/activity/PartGroupingDecorator.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,6 +633,12 @@
:global(.webchat__bubble) {
position: static;
width: var(--webchat-part-grouping__bubble--max-width);

:global(.webchat__bubble__content .webchat__adaptive-card-renderer > .ac-adaptiveCard) {
font-family: var(--webchat-fontFamilyBase);
/* Remove double padding for adaptive cards inside bubble */
padding: unset !important;
}
}

&:not(.part-grouping-decorator--group) {
Expand Down
Loading