auto merge of #3615 : pcwalton/servo/box-sizing-fix, r=glennw

Improves GitHub significantly.

r? @glennw
This commit is contained in:
bors-servo 2014-10-12 23:45:45 -06:00
commit c87f34f877
5 changed files with 74 additions and 57 deletions

View file

@ -169,3 +169,4 @@ fragment=top != ../html/acid2.html acid2_ref.html
!= input_height_a.html input_height_ref.html
== pre_ignorable_whitespace_a.html pre_ignorable_whitespace_ref.html
== many_brs_a.html many_brs_ref.html
== box_sizing_sanity_check_a.html box_sizing_sanity_check_ref.html

View file

@ -0,0 +1,7 @@
<!DOCTYPE html>
<html>
<body>
<div style="box-sizing: border-box; float: left; background: yellow;">Heeheehee</div>
</body>
</html>

View file

@ -0,0 +1,7 @@
<!DOCTYPE html>
<html>
<body>
<div style="float: left; background: yellow;">Heeheehee</div>
</body>
</html>