Skip to content

Commit ff134e1

Browse files
committed
Fix inline-flex
1 parent f200cbe commit ff134e1

File tree

2 files changed

+55
-0
lines changed

2 files changed

+55
-0
lines changed

src/lib.rs

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3337,6 +3337,10 @@ mod tests {
33373337
".foo { display: flex; display: grid }",
33383338
".foo{display:grid}"
33393339
);
3340+
minify_test(
3341+
".foo { display: -webkit-inline-flex; display: -moz-inline-box; display: inline-flex }",
3342+
".foo{display:-webkit-inline-flex;display:-moz-inline-box;display:inline-flex}"
3343+
);
33403344
prefix_test(
33413345
".foo{ display: flex }",
33423346
indoc! {r#"
@@ -3427,5 +3431,42 @@ mod tests {
34273431
..Browsers::default()
34283432
}
34293433
);
3434+
prefix_test(
3435+
".foo{ display: inline-flex }",
3436+
indoc! {r#"
3437+
.foo {
3438+
display: -webkit-inline-box;
3439+
display: -moz-inline-box;
3440+
display: -webkit-inline-flex;
3441+
display: -ms-inline-flexbox;
3442+
display: inline-flex;
3443+
}
3444+
"#},
3445+
Browsers {
3446+
safari: Some(4 << 16),
3447+
firefox: Some(14 << 16),
3448+
ie: Some(10 << 16),
3449+
..Browsers::default()
3450+
}
3451+
);
3452+
prefix_test(r#"
3453+
.foo {
3454+
display: -webkit-inline-box;
3455+
display: -moz-inline-box;
3456+
display: -webkit-inline-flex;
3457+
display: -ms-inline-flexbox;
3458+
display: inline-flex;
3459+
}
3460+
"#,
3461+
indoc! {r#"
3462+
.foo {
3463+
display: inline-flex;
3464+
}
3465+
"#},
3466+
Browsers {
3467+
safari: Some(14 << 16),
3468+
..Browsers::default()
3469+
}
3470+
);
34303471
}
34313472
}

src/properties/display.rs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,16 @@ impl Parse for DisplayPair {
166166
inside: DisplayInside::Flex(VendorPrefix::Ms),
167167
is_list_item: false
168168
}),
169+
"-webkit-inline-box" => Ok(DisplayPair {
170+
outside: DisplayOutside::Inline,
171+
inside: DisplayInside::Box(VendorPrefix::WebKit),
172+
is_list_item: false
173+
}),
174+
"-moz-inline-box" => Ok(DisplayPair {
175+
outside: DisplayOutside::Inline,
176+
inside: DisplayInside::Box(VendorPrefix::Moz),
177+
is_list_item: false
178+
}),
169179
"inline-grid" => Ok(DisplayPair {
170180
outside: DisplayOutside::Inline,
171181
inside: DisplayInside::Grid,
@@ -191,6 +201,10 @@ impl ToCss for DisplayPair {
191201
dest.write_str("inline-flex")
192202
}
193203
},
204+
DisplayPair { outside: DisplayOutside::Inline, inside: DisplayInside::Box(prefix), is_list_item: false } => {
205+
prefix.to_css(dest)?;
206+
dest.write_str("inline-box")
207+
},
194208
DisplayPair { outside: DisplayOutside::Inline, inside: DisplayInside::Grid, is_list_item: false } => dest.write_str("inline-grid"),
195209
DisplayPair { outside, inside, is_list_item } => {
196210
let default_outside = match inside {

0 commit comments

Comments
 (0)