File tree Expand file tree Collapse file tree 4 files changed +83
-7
lines changed Expand file tree Collapse file tree 4 files changed +83
-7
lines changed Original file line number Diff line number Diff line change 2
2
< html lang ="en ">
3
3
< head >
4
4
< meta charset ="utf-8 " />
5
+ < link rel ="stylesheet " href ="./style.css " />
6
+
5
7
< title > Challenges</ title >
6
8
</ head >
7
9
< article >
8
10
< h2 > Converse low Top</ h2 >
9
11
< 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 →</ 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 →</ a >
15
+ < h3 class =" detail-title " > Product details</ h3 >
16
+ < ul class =" detail-list " >
15
17
< li > light</ li >
16
18
< li > comfort</ li >
17
19
</ ul >
18
20
</ article >
19
- < button > add to cart</ button >
21
+ < button class =" cart " > add to cart</ button >
20
22
</ html >
Original file line number Diff line number Diff line change
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
+ }
Original file line number Diff line number Diff line change @@ -147,7 +147,9 @@ <h4>Related posts</h4>
147
147
</ aside >
148
148
149
149
< footer >
150
- < p id ="copyright "> Copyright © 2027 by The Code Magazine.</ p >
150
+ < p id ="copyright " class ="copyright text ">
151
+ Copyright © 2027 by The Code Magazine.
152
+ </ p >
151
153
</ footer >
152
154
</ body >
153
155
</ html >
Original file line number Diff line number Diff line change
1
+ body {
2
+ color : red;
3
+ }
4
+
1
5
h1 ,
2
6
h2 ,
3
7
h3 ,
@@ -122,3 +126,22 @@ a:active {
122
126
background-color : black;
123
127
font-style : italic;
124
128
}
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
+ }
You can’t perform that action at this time.
0 commit comments