Skip to content
Permalink
Browse files

Start pulling together summit demo elements

  • Loading branch information...
larsbergstrom committed Sep 20, 2013
1 parent dafb2c3 commit ee4a468c13bf1be7b32cc7b2fb6059b73729cc0b
Showing with 10 additions and 2 deletions.
  1. +10 −2 src/test/html/summit.html
@@ -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>

5 comments on commit ee4a468

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Sep 20, 2013

saw approval from jdm
at larsbergstrom@ee4a468

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Sep 20, 2013

merging larsbergstrom/servo/summit = ee4a468 into auto

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Sep 20, 2013

larsbergstrom/servo/summit = ee4a468 merged ok, testing candidate = 17864cb

@bors-servo

This comment has been minimized.

Copy link
Contributor

replied Sep 20, 2013

fast-forwarding master to auto = 17864cb

Please sign in to comment.
You can’t perform that action at this time.