Skip to content

Commit

Permalink
Merge branch 'master' into gh-pages
Browse files Browse the repository at this point in the history
* master:
  0.5.0
  update iframe src; add viewport meta tag
  • Loading branch information
cbracco committed Dec 3, 2015
2 parents 5921d0d + 0d014c5 commit 6c099a4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# 0.5.0 (December 13, 2015)

- Update `<iframe>` source attribute to point to `index.html` (so meta).
- Add viewport `<meta>` tag to `<head>` of `index.html`.

# 0.4.0 (August 17, 2015)

- Add `<meter>` element (thanks @haroenv!). Reorganize a few existing elements.
Expand Down
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>HTML5 Test Page</title>
</head>
<body>
Expand Down Expand Up @@ -321,7 +322,7 @@ <h3>Wrapped in a <code>&lt;figure&gt;</code> element, with a <code>&lt;figcaptio

<article id="embedded__iframe">
<header><h2>IFrame</h2></header>
<div><iframe src="http://www.google.com" height="300"></iframe></div>
<div><iframe src="index.html" height="300"></iframe></div>
<footer><p><a href="#top">[Top]</a></p></footer>
</article>
</section>
Expand Down

0 comments on commit 6c099a4

Please sign in to comment.