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
4 changed files
with
64 additions
and
11 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
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
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
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,43 @@ | ||
<html> | ||
<head> | ||
<style> | ||
#container { | ||
width: 300px; | ||
} | ||
#left { | ||
float: left; | ||
width: 100px; | ||
height: 100px; | ||
background: red; | ||
} | ||
#right { | ||
float: right; | ||
width: 100px; | ||
height: 150px; | ||
background: blue; | ||
} | ||
#clear1 { | ||
float: left; | ||
clear: left; | ||
width: 50px; | ||
height: 50px; | ||
background: green; | ||
} | ||
#clear2 { | ||
float: right; | ||
clear: right; | ||
width: 50px; | ||
height: 50px; | ||
background: green; | ||
} | ||
</style> | ||
</head> | ||
<body> | ||
<div id="container"> | ||
<div id="left"></div> | ||
<div id="right"></div> | ||
<div id="clear1"></div> | ||
<div id="clear2"></div> | ||
</div> | ||
</body> | ||
</html> |
425e837
There 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 metajack@425e837
425e837
There 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 metajack/servo/clear-float = 425e837 into auto
425e837
There 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.
metajack/servo/clear-float = 425e837 merged ok, testing candidate = 0787d76
425e837
There 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.
No active merge of candidate 425e837 found, likely manual push to master
425e837
There 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 metajack/servo/clear-float = 425e837 into auto
425e837
There 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.
metajack/servo/clear-float = 425e837 merged ok, testing candidate = c0fed8f
425e837
There 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/241
http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/196
425e837
There 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 = c0fed8f