Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #2038 : SimonSapin/servo/min-height-collapse, r=pcwalton

Browse source 
[Relevant spec](http://dev.w3.org/csswg/css2/box.html#collapsing-margins):

> top and bottom margins of a box that does not establish a new block formatting context and that has zero computed 'min-height', zero or 'auto' computed 'height', and no in-flow children
This commit is contained in:
bors-servo 2014-04-04 23:04:37 -04:00
commit 0f0b0b33bf
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/components/main/layout/model.rs
View file

@ -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