Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #6225 - larsbergstrom:linuxcon_test, r=metajack

Browse source 
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 -->
This commit is contained in:
bors-servo 2015-05-30 20:21:42 -05:00
commit c63fc4dc13
1 changed files with 61 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

61
tests/html/linuxcon.html Normal file
View file

@ -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>