auto merge of #963 : larsbergstrom/servo/summit, r=jdm

We need to figure out what we need to implement/fix for the summit, and this page pulls together all of the elements we want to show.
This commit is contained in:
bors-servo 2013-09-20 09:51:57 -07:00
commit 17864cb25d

View file

@ -3,10 +3,18 @@
<title>Summit demo page</title>
</head>
<body>
<iframe src="about-mozilla.html" style="display:block; border: 1px; width: 400px; height: 400px"
<iframe sandbox="allow-scripts" src="filmstrip.html" style="display:block; border: 1px; width: 200px; height: 200px"
frameborder="yes" scrolling="yes"></iframe>
<iframe src="summit-link.html" style="display:block; border: 1px; width: 400px; height: 400px"
<iframe sandbox="allow-scripts" src="longcat.html" style="display:block; border: 1px; width: 600px; height: 600px"
frameborder="yes" scrolling="yes"></iframe>
<iframe sandbox="allow-scripts" src="test_sandboxed_iframe.html"
style="display:block; border: 1px; width: 300px; height: 300px">
</iframe>
<iframe src="summit-link.html" style="display:block; border: 1px; width: 300px; height: 300px"
frameborder="yes" scrolling="yes">
</iframe>
</body>
</html>