diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-05-30 20:21:42 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-05-30 20:21:42 -0500 |
| commit | c63fc4dc13a23cf5b9f8c0972111b3f9436d2143 (patch) | |
| tree | b229783760f65278cc7560a74435e3450e7a6425 | |
| parent | 99b79fc248fbe94231775ddea452a465efb537bd (diff) | |
| parent | d569b3c197495d532b1c4d032bfaad4271771472 (diff) | |
| download | servo-c63fc4dc13a23cf5b9f8c0972111b3f9436d2143.tar.gz servo-c63fc4dc13a23cf5b9f8c0972111b3f9436d2143.zip | |
Auto merge of #6225 - larsbergstrom:linuxcon_test, r=metajack
r? @metajack @mbrubeck @glennw
(or anybody, really)
This is just a simple version of summit3.html that has only the spinning rust logo and matrix multiplication calculator. Longcat currently has regressed and has both some rendering issues (margins have reappeared between the segments) and it only works as a standalone page and no longer within an iframe. I'll look into those enough to fix or at least log bugs when I get back.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6225)
<!-- Reviewable:end -->
| -rw-r--r-- | tests/html/linuxcon.html | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/tests/html/linuxcon.html b/tests/html/linuxcon.html new file mode 100644 index 00000000000..4d2c09f4cd6 --- /dev/null +++ b/tests/html/linuxcon.html @@ -0,0 +1,61 @@ +<!DOCTYPE html> +<html> + <head> + <style> + html { + background-color: #ccc; + font-size: 50px; + } + .frame { + text-align: center; + } + .left { + float: left; + } + .narrow { + width: 300px; + margin: 10px; + } + .wide { + width: 600px; + } + .short { + height: 360px; + } + .tall { + height: 800px; + } + iframe { + width: 300px; + border: solid 1px black; + display: block; + background-color: white; + } + .wide iframe { + width: 600px; + } + .tall iframe { + height: 660px; + } + .short iframe { + height: 300px; + } + </style> + </head> + <body> + <div class="left"> + <div class="frame short narrow"> + <iframe id="frametwo" sandbox="allow-scripts" src="summit-two.html"> + </iframe> + frame one + </div> + </div> + <div class="left"> + <div class="frame short narrow"> + <iframe id="framethree" sandbox="allow-scripts" src="summit-three.html"> + </iframe> + frame two + </div> + </div> + </body> +</html> |