Skip to content

Commit c0feae3

Browse files
Reorganized/revised typography & nav exercise. Removed ID slide to extra reading resource. Moved quote exercise to HTML exercise #3 and related example files updated.
1 parent 2bad3df commit c0feae3

9 files changed

Lines changed: 199 additions & 221 deletions

File tree

200 KB
Loading
18.3 KB
Loading

index.html

Lines changed: 161 additions & 157 deletions
Large diffs are not rendered by default.

project/examples/css/exercise5.css

Lines changed: 14 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* GLOBAL STYLES
22
-----------------------------------------*/
3+
34
/* apply a natural box layout model to all elements, but allowing components to change */
45
html {
56
box-sizing: border-box;
@@ -8,40 +9,29 @@ html {
89
box-sizing: inherit;
910
}
1011

11-
/* clears floated child elements */
12-
.clearfix:before,
13-
.clearfix:after {
14-
content: " ";
15-
display: table;
16-
}
17-
.clearfix:after {
18-
clear: both;
19-
}
20-
2112
body {
2213
padding: 0;
2314
margin: 0;
2415
font-family: "Open Sans", sans-serif;
2516
color: #333;
2617
}
27-
header,
28-
section {
29-
padding: 20px 30px;
30-
}
3118
h1 {
3219
font-family: "Nixie One", serif;
3320
}
3421
h1, h2 {
3522
font-weight: 300;
3623
text-transform: uppercase;
37-
margin: 0;
38-
line-height: 1;
24+
margin: 0; /* removes default space */
25+
line-height: 1; /* tightens up the space between the headings */
3926
}
4027
a {
4128
color: #bf6d50;
4229
text-decoration: none;
4330
}
44-
31+
header,
32+
section {
33+
padding: 20px 30px;
34+
}
4535

4636
/* HEADER
4737
-----------------------------------------*/
@@ -52,19 +42,17 @@ header h2 {
5242
font-size: 18px;
5343
}
5444

55-
56-
/* NAVIGATION MENU
57-
-----------------------------------------*/
45+
/* Navigation */
5846
nav ul {
59-
list-style-type: none;
60-
margin: 0;
61-
padding: 0;
47+
list-style-type: none; /* removes bullets */
48+
margin: 0; /* removes default margin */
49+
padding: 0; /* removes default padding */
6250
}
6351
nav ul li {
64-
display: inline-block;
52+
display: inline-block; /* gets the list items to line up side by side */
6553
}
6654
nav a {
67-
display: block;
55+
display: block; /* changes the element to block */
6856
padding: 5px 15px;
69-
text-transform: uppercase;
57+
text-transform: uppercase;
7058
}

project/examples/exercise3-about.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,12 @@ <h2>Web Developer + City Girl</h2>
2424
<h2>Hello!</h2>
2525

2626
<p>[Personal summary or life story here] Lorem ipsum dolor sit amet, consectetur adipisicing elit. Debitis laboriosam officia blanditiis tempora sit fugiat molestiae iusto impedit ipsa cum, asperiores laborum, esse, doloribus explicabo! Autem, distinctio provident itaque non.</p>
27-
<p>Links to stuff about you, if needed. <a href="#">Link example</a> and <a href="#">another link example</a>.</p>
28-
<p>Or another paragraph! Lorem ipsum dolor sit amet, consectetur adipisicing elit. Neque maiores dolor id voluptatibus iure eum hic similique, cum impedit possimus nesciunt deleniti atque fugiat. Nesciunt in ipsum voluptatem debitis nihil!</p>
27+
<p>Links to stuff about you, if needed. <a href="#">Link example</a> and <a href="#">another link example</a>.</p>
28+
29+
<blockquote class="quote">
30+
<p>The more that you read, the more things you will know. The more that you learn, the more places you'll go.</p>
31+
<cite>― Dr. Seuss, I Can Read With My Eyes Shut!</cite>
32+
</blockquote>
2933
</section>
3034

3135
<footer>

project/examples/exercise4-about.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ <h2>Hello!</h2>
2828
<p>[Personal summary or life story here] Lorem ipsum dolor sit amet, consectetur adipisicing elit. Debitis laboriosam officia blanditiis tempora sit fugiat molestiae iusto impedit ipsa cum, asperiores laborum, esse, doloribus explicabo! Autem, distinctio provident itaque non.</p>
2929
<p>Links to stuff about you, if needed. <a href="#">Link example</a> and <a href="#">another link example</a>.</p>
3030
<p>Or another paragraph! Lorem ipsum dolor sit amet, consectetur adipisicing elit. Neque maiores dolor id voluptatibus iure eum hic similique, cum impedit possimus nesciunt deleniti atque fugiat. Nesciunt in ipsum voluptatem debitis nihil!</p>
31+
32+
<blockquote class="quote">
33+
<p>The more that you read, the more things you will know. The more that you learn, the more places you'll go.</p>
34+
<cite>― Dr. Seuss, I Can Read With My Eyes Shut!</cite>
35+
</blockquote>
3136
</section>
3237

3338
<footer>

project/examples/exercise5-about.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ <h2>Hello!</h2>
2828
<p>[Personal summary or life story here] Lorem ipsum dolor sit amet, consectetur adipisicing elit. Debitis laboriosam officia blanditiis tempora sit fugiat molestiae iusto impedit ipsa cum, asperiores laborum, esse, doloribus explicabo! Autem, distinctio provident itaque non.</p>
2929
<p>Links to stuff about you, if needed. <a href="#">Link example</a> and <a href="#">another link example</a>.</p>
3030
<p>Or another paragraph! Lorem ipsum dolor sit amet, consectetur adipisicing elit. Neque maiores dolor id voluptatibus iure eum hic similique, cum impedit possimus nesciunt deleniti atque fugiat. Nesciunt in ipsum voluptatem debitis nihil!</p>
31+
32+
<blockquote class="quote">
33+
<p>The more that you read, the more things you will know. The more that you learn, the more places you'll go.</p>
34+
<cite>― Dr. Seuss, I Can Read With My Eyes Shut!</cite>
35+
</blockquote>
3136
</section>
3237

3338
<footer>

project/examples/exercise5-contact.html

Lines changed: 0 additions & 27 deletions
This file was deleted.

project/examples/exercise5-home.html

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,17 @@
77
<link rel="stylesheet" href="css/exercise5.css">
88
</head>
99
<body>
10-
11-
<nav>
12-
<ul>
13-
<li><a href="exercise5-home.html">Home</a></li>
14-
<li><a href="exercise5-about.html">About</a></li>
15-
<li><a href="exercise5-contact.html">Contact</a></li>
16-
</ul>
17-
</nav>
18-
1910
<header>
2011
<h1>Jane Smith</h1>
2112
<h2>Web Developer + City Girl</h2>
13+
14+
<nav>
15+
<ul>
16+
<li><a href="exercise5-home.html">Home</a></li>
17+
<li><a href="exercise5-about.html">About</a></li>
18+
<li><a href="exercise5-contact.html">Contact</a></li>
19+
</ul>
20+
</nav>
2221
</header>
2322

2423
<footer>

0 commit comments

Comments
 (0)