Skip to content

Commit 7f957c5

Browse files
committed
Conflicts
1 parent 67e91fe commit 7f957c5

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

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: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ aside {
6565
border-bottom: 5px solid #1098ad;
6666
}
6767
/* body {
68-
background-color: orchid;
68+
background-color: orchid;
6969
} */
7070
/* .first-li {
7171
font-weight: bold;
@@ -102,3 +102,17 @@ a:active {
102102
}
103103

104104
/* LVHA */
105+
106+
/* Resolving conflicts */
107+
#copyright {
108+
color: red;
109+
}
110+
.copyright {
111+
color: blue;
112+
}
113+
.text {
114+
color: lime;
115+
}
116+
footer p {
117+
color: orange;
118+
}

0 commit comments

Comments
 (0)