auto merge of #995 : jdm/servo/demoborders, r=larsbergstrom

Fixes #993.
This commit is contained in:
bors-servo 2013-09-30 11:53:19 -07:00
commit 1e4e8d5224

View file

@ -3,17 +3,17 @@
<title>Summit demo page</title>
</head>
<body>
<iframe sandbox="allow-scripts" src="filmstrip.html" style="display:block; border: 1px; width: 200px; height: 200px"
<iframe sandbox="allow-scripts" src="filmstrip.html" style="display:block; border: 1px solid black; width: 200px; height: 200px"
frameborder="yes" scrolling="yes"></iframe>
<iframe sandbox="allow-scripts" src="longcat.html" style="display:block; border: 1px; width: 600px; height: 600px"
<iframe sandbox="allow-scripts" src="longcat.html" style="display:block; border: 1px solid black; 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">
style="display:block; border: 1px solid black; width: 300px; height: 300px">
</iframe>
<iframe src="summit-link.html" style="display:block; border: 1px; width: 300px; height: 300px"
<iframe src="summit-link.html" style="display:block; border: 1px solid black; width: 300px; height: 300px"
frameborder="yes" scrolling="yes">
</iframe>
</body>