From c61c578d9ff2c6c6f95e1b395af3588b7c0d7cbb Mon Sep 17 00:00:00 2001 From: tchemaster Date: Sat, 3 Jan 2026 21:18:53 -0300 Subject: [PATCH 1/9] Add header markup --- src/index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/index.html b/src/index.html index 60ff4f8..b83774f 100644 --- a/src/index.html +++ b/src/index.html @@ -13,6 +13,8 @@ - Placeholder +
+ Header +
\ No newline at end of file From 67c6293e74e311c85a790dfe57192e7545df1b32 Mon Sep 17 00:00:00 2001 From: tchemaster Date: Sat, 3 Jan 2026 21:21:44 -0300 Subject: [PATCH 2/9] Add header styles --- src/styles.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/styles.css b/src/styles.css index 4618cb1..831f374 100644 --- a/src/styles.css +++ b/src/styles.css @@ -1,4 +1,12 @@ body { font-family: Arial, Helvetica, sans-serif; font-size: 18px; +} + +.header { + height: 50px; + display: flex; + justify-content: center; + align-items: center; + border-bottom: 1px solid black; } \ No newline at end of file From 301bfa47b292758aa33b1c83f1db2669d2132b4f Mon Sep 17 00:00:00 2001 From: tchemaster Date: Sat, 3 Jan 2026 22:02:46 -0300 Subject: [PATCH 3/9] Add footer markup --- src/index.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/index.html b/src/index.html index b83774f..c36fc88 100644 --- a/src/index.html +++ b/src/index.html @@ -16,5 +16,8 @@
Header
+
+ Footer +
\ No newline at end of file From db2eb6e94a770b4bbfc6ba973dfe32fb67c6f110 Mon Sep 17 00:00:00 2001 From: tchemaster Date: Sat, 3 Jan 2026 22:03:15 -0300 Subject: [PATCH 4/9] Add footer styles --- src/styles.css | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/styles.css b/src/styles.css index 831f374..a5cbdf7 100644 --- a/src/styles.css +++ b/src/styles.css @@ -9,4 +9,12 @@ body { justify-content: center; align-items: center; border-bottom: 1px solid black; +} + +.footer { + height: 50px; + display: flex; + justify-content: center; + align-items: center; + border-top: 1px solid black; } \ No newline at end of file From 77b05a94e7110976ea9bc98fba366367dd62c6ca Mon Sep 17 00:00:00 2001 From: tchemaster Date: Sat, 3 Jan 2026 22:18:43 -0300 Subject: [PATCH 5/9] Add footer functionality --- src/index.html | 3 +++ src/styles.css | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/src/index.html b/src/index.html index b83774f..c36fc88 100644 --- a/src/index.html +++ b/src/index.html @@ -16,5 +16,8 @@
Header
+
+ Footer +
\ No newline at end of file diff --git a/src/styles.css b/src/styles.css index 831f374..a5cbdf7 100644 --- a/src/styles.css +++ b/src/styles.css @@ -9,4 +9,12 @@ body { justify-content: center; align-items: center; border-bottom: 1px solid black; +} + +.footer { + height: 50px; + display: flex; + justify-content: center; + align-items: center; + border-top: 1px solid black; } \ No newline at end of file From f08268e8eba9c071c871ef79642e51b9f52e943f Mon Sep 17 00:00:00 2001 From: tchemaster Date: Sat, 3 Jan 2026 22:23:40 -0300 Subject: [PATCH 6/9] Add element --- src/index.html | 1 + src/styles.css | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/index.html b/src/index.html index c36fc88..e6c0fcb 100644 --- a/src/index.html +++ b/src/index.html @@ -16,6 +16,7 @@
Header
+
Footer
diff --git a/src/styles.css b/src/styles.css index a5cbdf7..4c68d36 100644 --- a/src/styles.css +++ b/src/styles.css @@ -17,4 +17,8 @@ body { justify-content: center; align-items: center; border-top: 1px solid black; +} + +.content { + min-height: calc(100vh - 100px); } \ No newline at end of file From 1a174e8d129889e6cc3397c6f0a8db5e229738a9 Mon Sep 17 00:00:00 2001 From: tchemaster Date: Sat, 3 Jan 2026 22:24:37 -0300 Subject: [PATCH 7/9] height 49px footer --- src/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles.css b/src/styles.css index 4c68d36..d4bcf75 100644 --- a/src/styles.css +++ b/src/styles.css @@ -12,7 +12,7 @@ body { } .footer { - height: 50px; + height: 49px; display: flex; justify-content: center; align-items: center; From fa9a10f065bab9c4e8354dbc47e2227095f510e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Andr=C3=A9?= Date: Sat, 3 Jan 2026 23:36:15 -0300 Subject: [PATCH 8/9] Fix merge conflict in index.html Removed merge conflict markers from index.html --- src/index.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/index.html b/src/index.html index f5ff3ea..f02e1fc 100644 --- a/src/index.html +++ b/src/index.html @@ -16,12 +16,9 @@
Header
-<<<<<<< HEAD -=======
->>>>>>> footer
Footer
- \ No newline at end of file + From b867709235db07ce31dc4078b0c478745a048fef Mon Sep 17 00:00:00 2001 From: tchemaster Date: Sat, 3 Jan 2026 23:48:39 -0300 Subject: [PATCH 9/9] Add content styles --- src/styles.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/styles.css b/src/styles.css index 628b279..7d34593 100644 --- a/src/styles.css +++ b/src/styles.css @@ -22,4 +22,6 @@ body { .content { min-height: calc(100vh - 100px); + width: 720px; + margin: auto; } \ No newline at end of file