Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-10 07:55:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #6946 - pcwalton:block-formatting-context-margins, r=mbrubeck

Browse source 
layout: If the container of a block formatting context has margins in the inline direction, subtract those from the inline size of preceding floats.

Makes the content area on http://reddit.com/r/rust visible.

r? @mbrubeck

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6946)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-04 02:41:40 -06:00
commit 672b38e83a
4 changed files with 62 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tests/ref/basic.list
View file

@ -43,6 +43,7 @@ flaky_cpu == append_style_a.html append_style_b.html
== block_formatting_context_float_placement_a.html block_formatting_context_float_placement_ref.html
== block_formatting_context_relative_a.html block_formatting_context_ref.html
== block_formatting_context_translation_a.html block_formatting_context_translation_ref.html
== block_formatting_context_with_margin_a.html block_formatting_context_with_margin_ref.html
== block_image.html 500x300_green.html
!= block_image.html noteq_500x300_white.html
== block_replaced_content_a.html block_replaced_content_ref.html

29
tests/ref/block_formatting_context_with_margin_a.html Normal file
View file

@ -0,0 +1,29 @@
<!DOCTYPE html>
<html>
<head>
<style>
#float {
float: right;
width: 150px;
}
section {
margin-right: 450px;
background: gold;
}
#a {
font-size: 48px;
overflow: hidden;
}
</style>
</head>
<body>
<div id=float></div>
<section>
<div id=a>set breakpoints from within the comfort of your editor</div>
</section>
</body>
</html>

28
tests/ref/block_formatting_context_with_margin_ref.html Normal file
View file

@ -0,0 +1,28 @@
<!DOCTYPE html>
<html>
<head>
<style>
#float {
float: right;
width: 150px;
}
section {
margin-right: 450px;
background: gold;
}
#a {
font-size: 48px;
}
</style>
</head>
<body>
<div id=float></div>
<section>
<div id=a>set breakpoints from within the comfort of your editor</div>
</section>
</body>
</html>