Skip to content

Commit

Permalink
Start pulling together summit demo elements
Browse files Browse the repository at this point in the history
  • Loading branch information
@larsbergstrom
larsbergstrom committed Sep 20, 2013
1 parent dafb2c3 commit ee4a468
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/test/html/summit.html
View file
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from jdm
at larsbergstrom@ee4a468

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging larsbergstrom/servo/summit = ee4a468 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
success: http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/390
success: http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/345

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 17864cb

Please sign in to comment.