Merge branch 'master' into js-demo

This commit is contained in:
Elizabeth Craig
2019-02-26 11:40:53 -08:00
committed by GitHub
54 changed files with 226 additions and 181 deletions

View File

@@ -1,6 +1,6 @@
## HTML Demo
The [HTML demo page](http://localhost:8080/step1-00/html-demo/html-demo.html) is a large collection of HTML elements that you will come across during development. The full list of elements can be found on [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element).
The [HTML demo page](http://localhost:8080/step1-01/html-demo/html-demo.html) is a large collection of HTML elements that you will come across during development. The full list of elements can be found on [MDN](https://developer.mozilla.org/en-US/docs/Web/HTML/Element).
To learn more about each element, click on the elements below.

View File

@@ -13,7 +13,18 @@
<body>
<section>
<h2><a target="_blank" href="https://developer.mozilla.org/en-US/docs/Web/HTML/Element#Document_metadata">Document Meta Data</a></h2>
<p>head, title, link, style</p>
<pre>
&lt;head&gt;
&lt;title&gt;Intro to HTML&lt;/title&gt;
&lt;link rel=&quot;stylesheet&quot; href=&quot;./style.css&quot; /&gt;
&lt;style&gt;
hr {
margin: 40px;
}
&lt;/style&gt;
&lt;/head&gt;
</pre>
</section>
<hr />

View File

@@ -15,5 +15,6 @@
</ul>
<div id="markdownReadme"></div>
</div>
<script src="../assets/scripts.js"></script>
</body>
</html>

View File

@@ -1,6 +1,6 @@
<html>
<head>
<link rel="stylesheet" href="../css-demo/css-demo-finished.css" />
<link rel="stylesheet" href="../css-demo/css-demo-final.css" />
</head>
<body>
<div>