Skip to content

Commit

Permalink
Merge pull request #1355 from vivliostyle/fix/issue1354
Browse files Browse the repository at this point in the history
fix: Flexbox not working on page floats (Regression in v2.28.0)
  • Loading branch information
MurakamiShinyu authored Jun 28, 2024
2 parents b3ee157 + eb4b6e1 commit 88d00e9
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion packages/core/src/vivliostyle/vgen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,11 @@ export class ViewFactory
elementStyle,
computedStyle,
);
if (floatReference && PageFloats.isPageFloat(floatReference)) {
if (
floatReference &&
PageFloats.isPageFloat(floatReference) &&
computedStyle["display"] === Css.ident.block
) {
// Fix page float margin collapsing issue (Issue #1282)
computedStyle["display"] = Css.ident.flow_root;
}
Expand Down

0 comments on commit 88d00e9

Please sign in to comment.