Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-13 09:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7008 - pcwalton:floated-negative-margins, r=mbrubeck

Browse source 
layout: Take negative margins of floats into account when placing them.

Removes extraneous inline space on GitHub pull requests.

r? @mbrubeck

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7008)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-06 11:55:58 -06:00
commit cf4b411832
4 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/ref/basic.list
View file

@ -99,6 +99,7 @@ flaky_cpu == append_style_a.html append_style_b.html
== float_under_top_margin_a.html float_under_top_margin_ref.html
== floated_generated_content_a.html floated_generated_content_b.html
== floated_list_item_a.html floated_list_item_ref.html
== floated_negative_margins_a.html floated_negative_margins_ref.html
== floated_table_with_margin_a.html floated_table_with_margin_ref.html
== focus_selector.html focus_selector_ref.html
== font_advance.html font_advance_ref.html

16
tests/ref/floated_negative_margins_a.html Normal file
View file

@ -0,0 +1,16 @@
<style>
body {
margin: 0;
padding: 0;
}
#a {
float: left;
margin-left: -64px;
width: 128px;
height: 128px;
background: purple;
}
</style>
<body>
<div id=a></div>Hello

15
tests/ref/floated_negative_margins_ref.html Normal file
View file

@ -0,0 +1,15 @@
<style>
body {
margin: 0;
padding: 0;
}
#a {
float: left;
width: 64px;
height: 128px;
background: purple;
}
</style>
<body>
<div id=a></div>Hello