sky/tests/layout/margins.sky - Issue 700743002: Remove margin collapsing.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: sky/tests/layout/margins.sky

Issue 700743002: Remove margin collapsing. (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

OLD	NEW
1 <sky>	1 <sky>

2 <import src="../resources/check-layout.sky" as="checkLayout" />	2 <import src="../resources/check-layout.sky" as="checkLayout" />

3 <style>	3 <style>

	4 .root {

	5 margin: 5px;

	6 }

4 .child {	7 .child {

5 margin: 10px;	8 margin: 10px;

6 height: 30px;	9 height: 30px;

7 }	10 }

8 </style>	11 </style>

9 <div class="root" data-expected-height="70" data-total-y="10" style="backgroun d-color: pink">	12 <div class="root" data-expected-height="100" data-total-y="5" style="backgroun d-color: pink">

10 <div class="child" data-total-y="10" style="background-color: salmon"></div>	13 <!-- TODO(ojan): These numbers are right, but the test fails because we appe ar to have

11 <div class="child" data-total-y="50" style="background-color: papayawhip"></ div>	14 broken offsetTop to not include the parent's margin-top. -->

	15 <div class="child" data-total-y="15" style="background-color: salmon"></div>

	16 <div class="child" data-total-y="65" style="background-color: papayawhip"></ div>

12 </div>	17 </div>

13	18

14 <script>	19 <script>

15 checkLayout('.root');	20 checkLayout('.root');

16 </script>	21 </script>

17 </sky>	22 </sky>

	23

OLD	NEW

« no previous file with comments | « sky/engine/core/rendering/RenderBox.cpp ('k') | sky/tests/layout/margins-absolute.sky » ('j') | no next file with comments »