diff --git a/src/main/java/Team5/SmartTowns/trails/Trail.java b/src/main/java/Team5/SmartTowns/trails/Trail.java
index 202e02d01206d594630e6b28c594777ee421d3a4..c5849f56f419d4bb41c65b6360e19762a81180c9 100644
--- a/src/main/java/Team5/SmartTowns/trails/Trail.java
+++ b/src/main/java/Team5/SmartTowns/trails/Trail.java
@@ -12,7 +12,7 @@ public class Trail {
new Trail(2,"Trail2", "This is trail two"),
new Trail(3,"Trail3", "This is trail three"),
new Trail(4,"Trail4", "This is trail four"),
- new Trail(5,"Trail5", "This is trail five, it has no image")
+ new Trail(5,"Trail5", "EDITING THIS")
);
int id;
String name;
diff --git a/src/main/resources/static/css/allTrails.css b/src/main/resources/static/css/allTrails.css
index 87da2602458447d169d1781cf88a83709227d111..f48079f716a16039702453de36ccbec699f1f767 100644
--- a/src/main/resources/static/css/allTrails.css
+++ b/src/main/resources/static/css/allTrails.css
@@ -50,8 +50,8 @@ main {
#trailInfoContainer {
margin: auto;
- width: 95vw;
- min-height: 80vh;
+ width: 95svw;
+ min-height: 40svh;
min-width: 30svw;
}
@@ -60,15 +60,12 @@ main {
border: #000000 solid 2px;
border-radius: 10px;
box-shadow: 0 5px 20px 0 #000000;
-
margin:0;
padding:0;
animation: fadeIn 3s;
-
overflow: hidden;
display: flex;
flex-direction: column;
- /*min-height: 80svh;*/
min-width: 30svh;
& h1 {
@@ -84,17 +81,20 @@ main {
#trailFragContent {
margin: 0;
padding: 0;
-
display: flex;
overflow: hidden;
+ min-height: 40svh;
+ max-height: 60svh;
& img {
border-radius: 10px;
border: black solid 1px;
margin: 1%;
flex: 1 1;
- width: 30%;
- min-height: 30svh;
+ min-width: 20%;
+ max-width: 40%;
+ min-height: 20svh;
+ max-height: 40svh;
}
& p {
color: white;
@@ -103,10 +103,14 @@ main {
padding-left: 10px;
width: 60%;
border-left: solid darkgrey 2px;
-
}
-
}
+header {
+ box-shadow: #1e1e1e 0 0 10px 10px;
+}
-
+footer {
+ position: relative;
+ bottom: 0;
+}
\ No newline at end of file
diff --git a/src/main/resources/templates/allTrails/allTrails.html b/src/main/resources/templates/allTrails/allTrails.html
index 8304b05c7593d24d1d087f187440d5ce734d33d4..669020d15507bfcaeb8ca959df108269222ba8ec 100644
--- a/src/main/resources/templates/allTrails/allTrails.html
+++ b/src/main/resources/templates/allTrails/allTrails.html
@@ -4,12 +4,12 @@
<meta charset="UTF-8">
<title>All Trails</title>
<link rel="stylesheet" th:href="@{css/allTrails.css}">
- <link rel="stylesheet" th:href="@{css/banners.css}">
+ <link rel="stylesheet" th:href="@{css/templatingstyle.css}">
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
</head>
<body>
-<header th:replace="towns/templates.server/Templating.html :: headerBlock"></header>
+<header th:replace="~{/towns/Templating.html :: header}"></header>
<main>
<section id="allTrailsBar" class="centerFlex">
@@ -22,13 +22,13 @@
</section>
<section id="trailInfoContainer">
-
-
+ <h1 class="centerFlex">Please select your trail</h1>
+ <!--Loaded from thymeleaf-->
</section>
</main>
+<footer th:insert="~{/towns/Templating.html :: footer}"></footer>
-<footer th:replace="towns/templates.server/Templating.html:: footerBlock"></footer>
<script type="text/javascript" th:src="@{scripts/allTrails.js}"></script>