Skip to content

Commit 0e2ad25

Browse files
committed
Merge branch 'alpha' of github.com:master-style/styles into alpha
2 parents 0b5b2c4 + 2f1dba6 commit 0e2ad25

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/index.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,14 @@ StyleSheet.Styles.push(
157157
MarginStyle,
158158
PaddingStyle,
159159
FontSizeStyle,
160-
DisplayStyle,
160+
// flex
161+
FlexBasisStyle,
162+
FlexWrapStyle,
163+
FlexGrowStyle,
164+
FlexShrinkStyle,
165+
FlexDirectionStyle,
166+
FlexStyle, // last
167+
DisplayStyle, // after FlexStyle
161168
WidthStyle,
162169
HeightStyle,
163170
MinWidthStyle,
@@ -263,13 +270,6 @@ StyleSheet.Styles.push(
263270
GridAutoRowsStyle,
264271
GapStyle,
265272
OrderStyle,
266-
// flex
267-
FlexBasisStyle,
268-
FlexWrapStyle,
269-
FlexGrowStyle,
270-
FlexShrinkStyle,
271-
FlexDirectionStyle,
272-
FlexStyle, // last
273273
// break
274274
BreakInsideStyle,
275275
BreakBeforeStyle,

0 commit comments

Comments
 (0)