Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
149 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,3 @@ | ||
| == basic_width_px.html basic_width_em.html | ||
| == hello_a.html hello_b.html | ||
| == margin_a.html margin_b.html |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| <html> | ||
| <head> | ||
| <title>margin</title> | ||
| <style> | ||
| html { | ||
| font-size: 15px; | ||
| } | ||
| div { | ||
| background: yellow; | ||
| padding: 10px 10px 10px 10px; | ||
| margin: 10px 10px 10px 10px; | ||
| } | ||
| p { | ||
| color: white; | ||
| background: blue; | ||
| padding: 10px 10px 10px 10px; | ||
| margin: 10px 10px 10px 10px; | ||
| border-style: solid; | ||
| border-width: medium; | ||
| border-color: red; | ||
| } | ||
| .nomargin { | ||
| margin: 0px 10px 0px 10px; | ||
| } | ||
| .margin5 { | ||
| margin: 5px 10px 5px 10px; | ||
| } | ||
| .margin10 { | ||
| margin: 10px 10px 10px 10px; | ||
| } | ||
| .margin15 { | ||
| margin: 15px 10px 15px 10px; | ||
| } | ||
| .margin25 { | ||
| margin: 25px 10px 25px 10px; | ||
| } | ||
| .nopadding { | ||
| padding: 0px 0px 0px 0px; | ||
| } | ||
| .noborder { | ||
| border: 0px 0px 0px 0px; | ||
| } | ||
|
|
||
| </style> | ||
| </head> | ||
| <body> | ||
| <div> | ||
| <p class="margin15">p1</p> | ||
| <p class="margin10">p2</p> | ||
| <p class="margin15">p3</p> | ||
| </div> | ||
| <div class="nopadding" class="noborder" class="margin15"> | ||
| <p>p4</p> | ||
| <p>p5</p> | ||
| </div> | ||
| <div class="margin5"> | ||
| <p class="margin10">p6</p> | ||
| <p class="margin5">p7</p> | ||
| <p class="margin15">p8</p> | ||
| </div> | ||
| <div class="nopadding" class="noborder" class="margin15"> | ||
| <p class="nomargin">p9</p> | ||
| </div> | ||
| <div class="nopadding" class="noborder" class="nomargin"> | ||
| <p class="margin15">p10</p> | ||
| </div> | ||
| <div class="nopadding" class="noborder" class="nomargin"> | ||
| <p class="margin15">p11</p> | ||
| </div> | ||
| <div class="nopadding" class="noborder" class="margin5"> | ||
| <p class="margin25">p12</p> | ||
| </div> | ||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| <html> | ||
| <head> | ||
| <title>margin</title> | ||
| <style> | ||
| html { | ||
| font-size: 15px; | ||
| } | ||
| div { | ||
| background: yellow; | ||
| padding: 10px 10px 10px 10px; | ||
| margin: 10px 10px 10px 10px; | ||
| } | ||
| p { | ||
| color: white; | ||
| background: blue; | ||
| padding: 10px 10px 10px 10px; | ||
| margin: 10px 10px 10px 10px; | ||
| border-style: solid; | ||
| border-width: medium; | ||
| border-color: red; | ||
| } | ||
| .nomargin { | ||
| margin: 0px 10px 0px 10px; | ||
| } | ||
| .margin5 { | ||
| margin: 5px 10px 5px 10px; | ||
| } | ||
| .margin10 { | ||
| margin: 10px 10px 10px 10px; | ||
| } | ||
| .margin15 { | ||
| margin: 15px 10px 15px 10px; | ||
| } | ||
| .margin25 { | ||
| margin: 25px 10px 25px 10px; | ||
| } | ||
| .nopadding { | ||
| padding: 0px 0px 0px 0px; | ||
| } | ||
| .noborder { | ||
| border: 0px 0px 0px 0px; | ||
| } | ||
|
|
||
| </style> | ||
| </head> | ||
| <body> | ||
| <div> | ||
| <p class="margin15">p1</p> | ||
| <p class="margin5">p2</p> | ||
| <p class="margin15">p3</p> | ||
| </div> | ||
| <div class="nopadding" class="noborder" class="margin15"> | ||
| <p>p4</p> | ||
| <p>p5</p> | ||
| </div> | ||
| <div class="margin10"> | ||
| <p class="margin10">p6</p> | ||
| <p class="nomargin">p7</p> | ||
| <p class="margin15">p8</p> | ||
| </div> | ||
| <div class="nopadding" class="noborder" class="margin15"> | ||
| <p class="nomargin">p9</p> | ||
| </div> | ||
| <div class="nopadding" class="noborder" class="nomargin"> | ||
| <p class="margin15">p10</p> | ||
| </div> | ||
| <div class="nopadding" class="noborder" class="nomargin"> | ||
| <p class="margin10">p11</p> | ||
| </div> | ||
| <div class="nopadding" class="noborder" class="nomargin"> | ||
| <p class="margin25">p12</p> | ||
| </div> | ||
| </body> | ||
| </html> |
3fd7790There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from metajack
at ILyoan@3fd7790
3fd7790There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging ILyoan/servo/collapsing = 3fd7790 into auto
3fd7790There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ILyoan/servo/collapsing = 3fd7790 merged ok, testing candidate = 255819b
3fd7790There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/344
http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/299
3fd7790There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 255819b