Skip to content

Commit 89aa2ca

Browse files
Revised exercise 1, added some template and content revisions.
1 parent dd3e12c commit 89aa2ca

6 files changed

Lines changed: 40 additions & 30 deletions

File tree

framework/css/theme-llc.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,4 +274,8 @@ table img {
274274
background: rgba(255, 255, 255, 0.9);
275275
font-size: 18px;
276276
margin: 0;
277+
max-height: inherit;
278+
}
279+
.presenter-notes p {
280+
margin-top: 0;
277281
}
-9.66 KB
Binary file not shown.

framework/sass/theme-llc.scss

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,4 +295,9 @@ table {
295295
background: rgba(255, 255, 255, .9);
296296
font-size: 18px;
297297
margin: 0;
298+
max-height: inherit;
299+
300+
p {
301+
margin-top: 0;
302+
}
298303
}

index.html

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ <h2><span>with</span> Instructor Name</h2>
4444
</ul>
4545
</div>
4646
<div class="presenter-notes">
47-
<p>It's important to note at the beginning that a lot of material will be covered and their page will not be 100% complete by the end of the day. The goal of the day is to learn about the concepts. However, they will have most of the project done by the end of the day and "homework" and additional resources are provided at the end to help them complete their project.</p>
47+
<p>It's important to note at the beginning that a lot of material will be covered and their site will not be 100% complete by the end of the day. The goal of the day is to learn about the concepts. However, they will have most of the project done by the end of the day and "homework" and additional resources are provided at the end to help them complete their project.</p>
4848
<p>All code blocks in white are editable and CSS changes will be reflected in the slide. For exercises, all instructions listed under <strong>bonus</strong> are for those who complete the exercises early to make sure learners at all different levels have something to work on.</p>
4949
</div>
5050
</header>
@@ -168,20 +168,28 @@ <h2>Setting Up Our Work Flow</h2>
168168
1. Right click or two finger tap in Sublime and select **Open in Browser**. This will open the HTML file in your *default* browser.
169169

170170
What do you see? Your page should look like [exercise 1](project/examples/exercise1.html).
171-
172-
![example 1](framework/img/workshop/example-1.png)
171+
173172
</section>
174173

175-
<section class="slide" data-markdown>
176-
##Making changes
174+
<section class="slide">
175+
<h2 id="making-changes">Making changes</h2>
177176

178-
Let's update the content. Replace the "your name here" content, save the file, and refresh your browser.
177+
<p>Let's make a change. Replace the your name here content, save the file, and refresh your browser.</p>
179178

180-
This will be your work flow for the day.
179+
<p>This will be your work flow for the day.</p>
181180

182-
1. update the code
183-
2. save the file in Sublime
184-
3. refresh the browser
181+
<ol>
182+
<li>update the code</li>
183+
<li>save the file in Sublime</li>
184+
<li>refresh the browser</li>
185+
</ol>
186+
187+
<p><strong>Protip!</strong> Use keyboard shortcuts to improve your work flow.<br>
188+
<code>ctrl/cmnd + s</code> to save<br>
189+
<code>ctrl/cmnd + r</code> to refresh the browser</p>
190+
<div class="presenter-notes">
191+
<p>Let the learners know that there is an exercise coming up very soon to update the rest of the page. This is just to introduce them to the update/save/refresh flow and to break up the lecture a bit more.</p>
192+
</div>
185193
</section>
186194

187195
<section class="slide title" data-markdown>
@@ -192,17 +200,18 @@ <h2>Setting Up Our Work Flow</h2>
192200
<section class="slide" data-markdown>
193201
##HTML tags
194202

195-
HTML was created for web browsers to read. To display content properly in the browser, use <strong>tags</strong>. Left & right angled brackets (`shift` + comma key and `shift` + period key ) surround the tag name. Tags *usually* come in pairs — an opening tag and a closing tag with a forward slash:
203+
HTML was created for web browsers to read. To display content properly in the browser, use **tags**. Left & right angled brackets (`shift` + comma key and `shift` + period key ) surround the tag name. Tags *usually* come in pairs — an opening tag and a closing tag with a forward slash:
196204

197205
```xml
198206
&lt;tagname>&lt;/tagname>
199207
```
208+
Just like the different languages that we speak and write, HTML has to follow proper "grammar" rules. This is referred to as **syntax**. Tags are used to describe the content, **not** what they look like. That's what CSS is for.
209+
200210
The are many different HTML tags used to create structure and add semantics (meaning) to the content. For example, any content between the `&lt;html>&lt;/html>` tag tells the browser that it is HTML code and content between the `&lt;title>&lt;/title>` tag describes the web page title.
201211

202212
```xml
203213
&lt;p>I'm a paragraph because I'm wrapped by paragraph tags.&lt;/p>
204214
```
205-
Just like the different languages that we speak and write, HTML has to follow proper "grammar" rules. This is referred to as **syntax**.Tags are used to describe the content, **not** what they look like. That's what CSS is for.
206215
</section>
207216

208217
<section class="slide">
@@ -222,9 +231,6 @@ <h2>Nesting HTML tags</h2>
222231
<li>
223232
The <code>&lt;html&gt;</code> tag is always first and <strong>all</strong> other tags are nested within <code>&lt;html&gt;</code>.
224233
</li>
225-
<li>
226-
<code>&lt;head&gt;</code> is the child of <code>&lt;html&gt;</code> and the parent of the <code>&lt;title&gt;</code> tag.
227-
</li>
228234
<li>
229235
What is the relationship of <code>&lt;title&gt;</code> to the <code>&lt;head&gt;</code> tag? <span class="delayed"><em>child element</em></span>
230236
</li>
@@ -237,8 +243,7 @@ <h2>Nesting HTML tags</h2>
237243
<section class="slide" data-markdown>
238244
##BASIC HTML DOCUMENT
239245

240-
These are the basic HTML tags needed for every webpage.
241-
246+
We've seen these tags in our project file. These are the basic HTML tags required for every web page.
242247

243248
&lt;!DOCTYPE html&gt;
244249
&lt;html&gt;
@@ -256,12 +261,11 @@ <h2>Nesting HTML tags</h2>
256261
</section>
257262

258263
<section class="slide title" data-markdown>
259-
#Organizing your files
260-
##Creating web pages and file structures
264+
#Adding content
261265
</section>
262266

263267
<section class="slide" data-markdown>
264-
##HTML content: adding text
268+
##Adding text
265269

266270
Heading tags are used for headings / page titles. There are six headings tags ranging from `&lt;h1>` to `&lt;h6>` and follow a hierarchy. `&lt;h1>` is the most significant heading on the page.
267271

@@ -286,22 +290,20 @@ <h2>Nesting HTML tags</h2>
286290
</section>
287291

288292
<section class="slide" data-markdown>
289-
##Exercise #1 - Making & Saving Changes (10 mins)
293+
##Exercise #1 - Updating your home page (10 mins)
290294

291-
1. In your text editor (Sublime Text), update your name and tagline by changing the text *in between* the `&lt;h1>&lt;/h1>` and `&lt;h2>&lt;/h2>` tags.
292-
1. Save your file using keyboard shortcuts, **Cmnd/Ctrl** + **S**, or **File > Save**.
293-
1. Go back to your browser and refresh it to see the changes.
294-
* Use the rounded arrow in the right of the browser's address bar or use keyboard shortcut, **Cmnd/Ctrl** + **R**.
295+
1. In your text editor (Sublime Text), update your name.
296+
1. Add your tag line under your name using the appropriate heading tag.
295297
1. Change the content in the `&lt;title>&lt;/title>` tag. Where do you see this change?
296-
1. Update the footer content in the `&lt;p>&lt;/p>` to include a copyright message.
298+
1. Add a copyright message. Use a paragraph (`&lt;p>`) tag *inside* of the `&lt;footer>` tag.
297299

298300
**Bonus:** Try using an HTML code for the copyright *symbol*. Here are some resources:
299301
http://character-code.com/ascii-table.php
300302
http://unicode-table.com/en/#00A9
301303

302-
Your page should now look similar to [exercise1-updated.html](project/examples/exercise1-updated.html)
304+
Don't forget to save and refresh your browser after each change!
303305

304-
**Protip!** Every time you make a change to your web page, don't forget to save and refresh your browser!
306+
Your page should now look similar to [exercise1-updated.html](project/examples/exercise1-updated.html)
305307
</section>
306308

307309
<section class="slide project" data-markdown>

project/examples/exercise1.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<body>
88
<header>
99
<h1>Your Name Here</h1>
10-
<h2>Your tag line</h2>
1110
</header>
1211

1312
<footer>

project/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<body>
88
<header>
99
<h1>Your Name Here</h1>
10-
<h2>Your tag line</h2>
10+
1111
</header>
1212

1313
<footer>

0 commit comments

Comments
 (0)