Skip to content

Commit e88d180

Browse files
dmceachernmsftedwardlee-msft
authored andcommitted
Cherrypick Update small packages #2527
1 parent 312521b commit e88d180

29 files changed

Lines changed: 37 additions & 7 deletions

File tree

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix component styles to bring components back in line with designs after fluent updates.",
4+
"packageName": "@azure/communication-react",
5+
"email": "94866715+dmceachernmsft@users.noreply.github.com",
6+
"dependentChangeType": "patch"
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Fix component styles to bring components back in line with designs after fluent updates.",
4+
"packageName": "@azure/communication-react",
5+
"email": "94866715+dmceachernmsft@users.noreply.github.com",
6+
"dependentChangeType": "patch"
7+
}

common/config/rush/pnpm-lock.yaml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/react-components/src/components/DevicePermissions/DomainPermissionsScaffolding.tsx

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import {
1515
} from '@fluentui/react';
1616
import { _formatString, _pxToRem } from '@internal/acs-ui-common';
1717
import {
18+
iconBannerContainerStyles,
1819
iconContainerStyles,
1920
iconPrimaryStyles,
2021
linkTextStyles,
@@ -110,25 +111,31 @@ export interface DomainPermissionsStyles extends BaseCustomStyles {
110111
troubleshootingLink?: ILinkStyles;
111112
}
112113

114+
/**
115+
* spacing for the icons in the banner.
116+
*/
117+
const tokens = { childrenGap: '2rem' };
118+
113119
/** @private */
114120
export const DomainPermissionsContainer = (props: DomainPermissionsContainerProps): JSX.Element => {
115121
const { appName, onTroubleshootingClick, onPrimaryButtonClick, strings } = props;
116122
const theme = useTheme();
123+
117124
return (
118125
<Stack style={{ padding: '2rem', maxWidth: '25.375rem' }} aria-label={strings?.ariaLabel}>
119-
<Stack horizontal style={{ paddingBottom: '1rem' }} horizontalAlign={'space-between'}>
126+
<Stack styles={iconBannerContainerStyles} horizontal horizontalAlign={'center'} verticalFill tokens={tokens}>
120127
{props.cameraIconName && (
121-
<Stack styles={iconContainerStyles} horizontalAlign={'center'}>
128+
<Stack>
122129
<Icon styles={iconPrimaryStyles} iconName={props.cameraIconName}></Icon>
123130
</Stack>
124131
)}
125132
{props.connectorIconName && (
126-
<Stack styles={iconContainerStyles} horizontalAlign={'center'}>
133+
<Stack styles={iconContainerStyles} horizontal>
127134
<Icon styles={sparkleIconBackdropStyles(theme)} iconName={props.connectorIconName}></Icon>
128135
</Stack>
129136
)}
130137
{props.microphoneIconName && (
131-
<Stack styles={iconContainerStyles} horizontalAlign={'center'}>
138+
<Stack>
132139
<Icon styles={iconPrimaryStyles} iconName={props.microphoneIconName}></Icon>
133140
</Stack>
134141
)}

packages/react-components/src/components/styles/DomainPermissions.styles.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,21 @@ import { _pxToRem } from '@internal/acs-ui-common';
99
*/
1010
export const iconContainerStyles: IStackStyles = {
1111
root: {
12-
margin: 'auto',
12+
marginTop: 'auto',
13+
marginBottom: 'auto',
1314
position: 'relative'
1415
}
1516
};
1617

18+
/**
19+
* @internal
20+
*/
21+
export const iconBannerContainerStyles: IStackStyles = {
22+
root: {
23+
paddingBottom: '1rem'
24+
}
25+
};
26+
1727
/**
1828
* @internal
1929
*/

packages/react-components/src/components/styles/SendBox.styles.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export const sendIconStyle = mergeStyles({
5454
* @private
5555
*/
5656
export const fileUploadCardsStyles = mergeStyles({
57-
margin: '0.25rem',
57+
margin: '0 0.25rem 0.25rem 0.25rem',
5858
maxHeight: '12.5rem',
5959
overflow: 'auto'
6060
});
Loading

0 commit comments

Comments
 (0)