Skip to content

Commit 1cf052c

Browse files
committed
.
1 parent f162eb3 commit 1cf052c

File tree

4 files changed

+83
-7
lines changed

4 files changed

+83
-7
lines changed

starter/02-HTML-Fundamentals/challenge.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8" />
5+
<link rel="stylesheet" href="./style.css" />
6+
57
<title>Challenges</title>
68
</head>
79
<article>
810
<h2>Converse low Top</h2>
911
<img src="./img/challenges.jpg" alt="challenges" width="300" />
10-
<p><strong>$60.0</strong></p>
11-
<p>Free shipping</p>
12-
<a href="#">More Information &rarr;</a>
13-
<h3>Product details</h3>
14-
<ul>
12+
<p class="price"><strong>$60.0</strong></p>
13+
<p class="shipping">Free shipping</p>
14+
<a class="more-info" href="#">More Information &rarr;</a>
15+
<h3 class="detail-title">Product details</h3>
16+
<ul class="detail-list">
1517
<li>light</li>
1618
<li>comfort</li>
1719
</ul>
1820
</article>
19-
<button>add to cart</button>
21+
<button class="cart">add to cart</button>
2022
</html>
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
body {
2+
border: 5px solid #000;
3+
}
4+
h2 {
5+
text-align: center;
6+
background-color: #ddd;
7+
text-transform: uppercase;
8+
}
9+
10+
.price {
11+
font-weight: bold;
12+
font-size: 25px;
13+
}
14+
15+
.shipping {
16+
text-transform: uppercase;
17+
font-weight: bold;
18+
color: #777;
19+
}
20+
21+
.more-info:link,
22+
.more-info:visited {
23+
color: #000;
24+
text-decoration: underline;
25+
}
26+
27+
.more-info:hover,
28+
.more-info:active {
29+
text-decoration: none;
30+
}
31+
32+
.detail-title {
33+
text-transform: uppercase;
34+
}
35+
.detail-list {
36+
list-style: square;
37+
}
38+
39+
.cart {
40+
font-size: 30px;
41+
text-transform: uppercase;
42+
background-color: #000;
43+
color: white;
44+
}
45+
.cart:hover {
46+
color: black;
47+
background-color: white;
48+
cursor: pointer;
49+
}

starter/03-CSS-Fundamentals/index.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,9 @@ <h4>Related posts</h4>
147147
</aside>
148148

149149
<footer>
150-
<p id="copyright">Copyright &copy; 2027 by The Code Magazine.</p>
150+
<p id="copyright" class="copyright text">
151+
Copyright &copy; 2027 by The Code Magazine.
152+
</p>
151153
</footer>
152154
</body>
153155
</html>

starter/03-CSS-Fundamentals/style.css

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
body {
2+
color: red;
3+
}
4+
15
h1,
26
h2,
37
h3,
@@ -122,3 +126,22 @@ a:active {
122126
background-color: black;
123127
font-style: italic;
124128
}
129+
130+
/* resolving conflicts */
131+
/* #copyright {
132+
color: red;
133+
}
134+
.copyright {
135+
color: blue;
136+
}
137+
.text {
138+
color: yellow;
139+
}
140+
141+
footer p {
142+
color: green;
143+
} */
144+
145+
nav {
146+
font-size: 18px;
147+
}

0 commit comments

Comments
 (0)