Skip to content

Commit fcf429c

Browse files
Update style.css
1 parent 57465db commit fcf429c

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

style.css

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
* {
2-
<<<<<<< HEAD
32
box-sizing: border-box;
43
margin: 0;
54
padding: 0;
@@ -10,7 +9,6 @@ body {
109
}
1110
p {
1211
font-family: Outfit, arial, sans-serif;
13-
=======
1412
margin: 0;
1513
padding: 0;
1614
box-sizing: border-box;
@@ -24,16 +22,12 @@ body {
2422
p {
2523
font-family: Outfit, arial, sans-serif;
2624
font-size: 1.5rem;
27-
>>>>>>> style-modification
2825
}
2926
h1 {
3027
font-family: Outfit, sans-serif;
3128
font-weight: 700;
32-
<<<<<<< HEAD
3329
font-size: 25px;
34-
=======
3530
font-size: 2.4rem;
36-
>>>>>>> style-modification
3731
margin: 0;
3832
}
3933

@@ -52,11 +46,7 @@ h1 {
5246
align-items: center;
5347
justify-content: center;
5448
text-align: center;
55-
<<<<<<< HEAD
56-
width: 300px;
57-
=======
5849
width: 30rem; /* 300px */
59-
>>>>>>> style-modification
6050
padding: 20px;
6151
border-radius: 10px;
6252
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
@@ -92,11 +82,7 @@ h1 {
9282
}
9383

9484
.attribution {
95-
<<<<<<< HEAD
96-
font-size: 11px;
97-
=======
9885
font-size: 1.1rem;
99-
>>>>>>> style-modification
10086
text-align: center;
10187
}
10288
.attribution a {

0 commit comments

Comments
 (0)