Skip to content

Commit 06363af

Browse files
committed
update ex2
1 parent ba0ad26 commit 06363af

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

Week1/js-exercises/ex2-aboutMe.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ favFood.textContent = 'Fish';
2828
const homeTown = document.getElementById('hometown');
2929
homeTown.textContent = 'Asmara, Eritrea';
3030
const liElements = document.querySelectorAll('li');
31-
<<<<<<< HEAD
3231
// liElements.style.listStyleType = 'none';
3332

3433
// loop through the li's and add them a class name
@@ -37,17 +36,16 @@ for (let i = 0; i < liElements.length; i++) {
3736
liElements[i].style.listStyleType = 'none';
3837
liElements[i].style.fontSize = '1.5rem';
3938
liElements[i].style.padding = '0.8rem';
40-
=======
4139

4240
//loop through the li's and add them a class name
4341
for (let i = 0; i < liElements.length; i++) {
4442
liElements[i].className = 'list-item';
45-
>>>>>>> df1a0bedd977d6d72a0e60f6f558fc670060d3e9
43+
4644
}
4745
const myPhoto = document.createElement('img');
4846
myPhoto.src = 'photo.jpg'; // add photo source
4947
myPhoto.style.display = 'block';
5048
myPhoto.style.borderRadius = '50%';
5149
myPhoto.style.width = '18.75rem';
5250
myPhoto.style.margin = '0 auto';
53-
document.body.appendChild(myPhoto); // append photo to the page
51+
document.body.appendChild(myPhoto); // append photo to the page

0 commit comments

Comments
 (0)