From ed2a700c8a885040b03794020edb69fa0c019125 Mon Sep 17 00:00:00 2001
From: Damjan Jakimovski <damejakimovski12@gmail.com>
Date: Sun, 28 Apr 2024 19:37:07 +0200
Subject: [PATCH 1/2] WS008 -feature: added background image
---
index.html | 25 ++++++++++++++-----------
style.css | 22 ++++++++++++++++++++++
2 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/index.html b/index.html
index 869cbc2..1703cef 100644
--- a/index.html
+++ b/index.html
@@ -1,13 +1,16 @@
<!DOCTYPE html>
<html lang="en">
- <head>
- <meta charset="UTF-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <link rel="stylesheet" href="./style.css" />
- <title>Document</title>
- </head>
- <body>
- <!-- TODO - this h1 should be deleted -->
- <h1>Starter file</h1>
- </body>
-</html>
+
+<head>
+ <meta charset="UTF-8" />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+ <link rel="stylesheet" href="./style.css" />
+ <title>Document</title>
+</head>
+
+<body>
+ <section class="main-content">
+ <div class="inner-container border-radius">
+</body>
+
+</html>
\ No newline at end of file
diff --git a/style.css b/style.css
index 7317f86..1904b3b 100644
--- a/style.css
+++ b/style.css
@@ -21,3 +21,25 @@ ol {
img {
max-width: 100%;
}
+
+.main-content {
+ height: 100vh;
+ display: flex;
+ justify-content: center;
+ background-image: linear-gradient(
+ to bottom,
+ rgba(0, 0, 0, 0.6),
+ rgba(0, 0, 0, 0.8)
+ ),
+ url("./images/image-01.jpg");
+ background-position: center;
+ background-size: cover;
+ background-position: fixed;
+ padding: 100px 16px;
+}
+.main-content .inner-container {
+ width: 100%;
+ padding: 30px;
+ height: 80vh;
+ overflow: auto;
+}
--
GitLab
From 6d6af8c37b16af0664c8118f2fbd53587153595e Mon Sep 17 00:00:00 2001
From: Damjan Jakimovski <damejakimovski12@gmail.com>
Date: Sun, 28 Apr 2024 20:22:48 +0200
Subject: [PATCH 2/2] WS008 merge conflict solved
---
index.html | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/index.html b/index.html
index ffdcc2f..7fe9cbe 100644
--- a/index.html
+++ b/index.html
@@ -25,18 +25,6 @@
<div class="inner-container border-radius">
</div>
</section>
-</body>
-
-</html>
-
-<head>
- <meta charset="UTF-8" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0" />
- <link rel="stylesheet" href="./style.css" />
- <title>Document</title>
-</head>
-
-<body>
<nav class="color-white">
<div class="inner-container">
<div id="logo">Logo</div>
@@ -91,9 +79,6 @@
</section>
</div>
</section>
-
- <!-- Footer -->
-
<footer class="color-white text-center">
<p>© 2023 Animals website. All rights reserved.</p>
</footer>
--
GitLab