Title: [152152] branches/safari-537-branch/LayoutTests
- Revision
- 152152
- Author
- [email protected]
- Date
- 2013-06-27 22:47:19 -0700 (Thu, 27 Jun 2013)
Log Message
Merge a file from r151836 that was lost in the r152027 merge.
* fast/css/text-overflow-ellipsis-behind-floats-expected.html:
Modified Paths
Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (152151 => 152152)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-06-28 03:31:57 UTC (rev 152151)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-06-28 05:47:19 UTC (rev 152152)
@@ -1,3 +1,9 @@
+2013-06-27 Jessie Berlin <[email protected]>
+
+ Merge a file from r151836 that was lost in the r152027 merge.
+
+ * fast/css/text-overflow-ellipsis-behind-floats-expected.html:
+
2013-06-27 Lucas Forschler <[email protected]>
Merge r152038
Modified: branches/safari-537-branch/LayoutTests/fast/css/text-overflow-ellipsis-behind-floats-expected.html (152151 => 152152)
--- branches/safari-537-branch/LayoutTests/fast/css/text-overflow-ellipsis-behind-floats-expected.html 2013-06-28 03:31:57 UTC (rev 152151)
+++ branches/safari-537-branch/LayoutTests/fast/css/text-overflow-ellipsis-behind-floats-expected.html 2013-06-28 05:47:19 UTC (rev 152152)
@@ -2,22 +2,18 @@
<html>
<head>
<style>
- div {
+ .ellipsis {
+ width: 200px;
overflow: hidden;
white-space: nowrap;
- }
-
- .ellipsis {
text-overflow: ellipsis;
}
-
</style>
</head>
<body>
<div class="ellipsis">
-<div id="float"></div>
-1. Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
</div>
</body>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes