Skip to content

Commit 588decb

Browse files
committed
fix(react-divider): update styles to not use CSS shorthands
1 parent b8537fb commit 588decb

8 files changed

Lines changed: 27 additions & 20 deletions
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "update styles to not use CSS shorthands",
4+
"packageName": "@fluentui/react-divider",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

packages/react-divider/src/components/Divider/useDividerStyles.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { mergeClasses, makeStyles } from '@fluentui/react-make-styles';
1+
import { mergeClasses, shorthands, makeStyles } from '@fluentui/react-make-styles';
22
import { DividerState } from './Divider.types';
33

44
export const dividerClassName = 'fui-Divider';
@@ -29,15 +29,15 @@ const useBaseStyles = makeStyles({
2929
display: 'flex',
3030
flexGrow: 1,
3131

32-
borderColor: theme.colorNeutralStroke2,
32+
...shorthands.borderColor(theme.colorNeutralStroke2),
3333
},
3434

3535
':after': {
3636
boxSizing: 'border-box',
3737
display: 'flex',
3838
flexGrow: 1,
3939

40-
borderColor: theme.colorNeutralStroke2,
40+
...shorthands.borderColor(theme.colorNeutralStroke2),
4141
},
4242
}),
4343

@@ -79,29 +79,29 @@ const useBaseStyles = makeStyles({
7979
color: theme.colorBrandForeground1,
8080

8181
':before': {
82-
borderColor: theme.colorBrandStroke1,
82+
...shorthands.borderColor(theme.colorBrandStroke1),
8383
},
8484

8585
':after': {
86-
borderColor: theme.colorBrandStroke1,
86+
...shorthands.borderColor(theme.colorBrandStroke1),
8787
},
8888
}),
8989
subtle: theme => ({
9090
':before': {
91-
borderColor: theme.colorNeutralStroke3,
91+
...shorthands.borderColor(theme.colorNeutralStroke3),
9292
},
9393

9494
':after': {
95-
borderColor: theme.colorNeutralStroke3,
95+
...shorthands.borderColor(theme.colorNeutralStroke3),
9696
},
9797
}),
9898
strong: theme => ({
9999
':before': {
100-
borderColor: theme.colorNeutralStroke1,
100+
...shorthands.borderColor(theme.colorNeutralStroke1),
101101
},
102102

103103
':after': {
104-
borderColor: theme.colorNeutralStroke1,
104+
...shorthands.borderColor(theme.colorNeutralStroke1),
105105
},
106106
}),
107107
});

packages/react-divider/src/stories/DividerAlignContent.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import { makeStyles } from '@fluentui/react-make-styles';
3-
import { Divider } from '../Divider'; // codesandbox-dependency: @fluentui/react-divider ^9.0.0-beta
3+
import { Divider } from '../Divider';
44

55
const useStyles = makeStyles({
66
root: {

packages/react-divider/src/stories/DividerAppearance.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import { makeStyles } from '@fluentui/react-make-styles';
3-
import { Divider } from '../Divider'; // codesandbox-dependency: @fluentui/react-divider ^9.0.0-beta
3+
import { Divider } from '../Divider';
44

55
const useStyles = makeStyles({
66
root: {

packages/react-divider/src/stories/DividerCustomStyles.stories.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
2-
import { makeStyles } from '@fluentui/react-make-styles';
3-
import { Divider } from '../Divider'; // codesandbox-dependency: @fluentui/react-divider ^9.0.0-beta
2+
import { shorthands, makeStyles } from '@fluentui/react-make-styles';
3+
import { Divider } from '../Divider';
44

55
const useStyles = makeStyles({
66
root: {
@@ -20,7 +20,7 @@ const useStyles = makeStyles({
2020
display: 'flex',
2121
flexDirection: 'column',
2222
justifyContent: 'center',
23-
background: 'white',
23+
backgroundColor: 'white',
2424
minHeight: '192px',
2525
},
2626
customWidth: {
@@ -35,14 +35,14 @@ const useStyles = makeStyles({
3535
},
3636
customLineColor: {
3737
':before': {
38-
borderColor: '#FF00FF',
38+
...shorthands.borderColor('#FF00FF'),
3939
},
4040
':after': {
41-
borderColor: '#FF00FF',
41+
...shorthands.borderColor('#FF00FF'),
4242
},
4343
},
4444
customLineStyle: {
45-
borderWidth: '2px',
45+
...shorthands.borderWidth('2px'),
4646
':before': {
4747
borderTopStyle: 'dashed',
4848
borderTopWidth: '2px',

packages/react-divider/src/stories/DividerDefault.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import { makeStyles } from '@fluentui/react-make-styles';
3-
import { Divider } from '../Divider'; // codesandbox-dependency: @fluentui/react-divider ^9.0.0-beta
3+
import { Divider } from '../Divider';
44

55
const useStyles = makeStyles({
66
root: {

packages/react-divider/src/stories/DividerInset.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import { makeStyles } from '@fluentui/react-make-styles';
3-
import { Divider } from '../Divider'; // codesandbox-dependency: @fluentui/react-divider ^9.0.0-beta
3+
import { Divider } from '../Divider';
44

55
const useStyles = makeStyles({
66
root: {

packages/react-divider/src/stories/DividerVertical.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import { makeStyles } from '@fluentui/react-make-styles';
3-
import { Divider } from '../Divider'; // codesandbox-dependency: @fluentui/react-divider ^9.0.0-beta
3+
import { Divider } from '../Divider';
44

55
const useStyles = makeStyles({
66
root: {

0 commit comments

Comments
 (0)