diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/main/layout/model.rs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/components/main/layout/model.rs b/src/components/main/layout/model.rs index 378c43d1bb6..098e238a252 100644 --- a/src/components/main/layout/model.rs +++ b/src/components/main/layout/model.rs @@ -7,7 +7,7 @@ use layout::box_::Box; use computed = style::computed_values; -use style::computed_values::{LPA_Auto, LPA_Length, LPA_Percentage}; +use style::computed_values::{LPA_Auto, LPA_Length, LPA_Percentage, LP_Length, LP_Percentage}; use servo_util::geometry::Au; use servo_util::geometry; @@ -112,7 +112,16 @@ impl MarginCollapseInfo { AccumulatingCollapsibleTopMargin => { match fragment.style().Box.get().height { LPA_Auto | LPA_Length(Au(0)) | LPA_Percentage(0.) => { - MarginsCollapseThroughFinalMarginState + match fragment.style().Box.get().min_height { + LP_Length(Au(0)) | LP_Percentage(0.) => { + MarginsCollapseThroughFinalMarginState + }, + _ => { + // If the box has non-zero min-height, margins may not collapse + // through it. + BottomMarginCollapsesFinalMarginState + } + } }, _ => { // If the box has an explicitly specified height, margins may not collapse |