diff --git a/src/main/resources/static/css/allTrails.css b/src/main/resources/static/css/allTrails.css index 1b441111518afb14cea3c1d1debe553ad32d941f..398f01255c3dc2f7dcb0d6da3ccd461f910b072e 100644 --- a/src/main/resources/static/css/allTrails.css +++ b/src/main/resources/static/css/allTrails.css @@ -4,6 +4,8 @@ body { background-color: rgb(41, 41, 41); margin: 0; + display: flex; + flex-direction: column; } main { } @@ -49,10 +51,8 @@ main { } #trailInfoContainer { - margin: auto; - width: 95svw; - min-height: 40svh; - min-width: 30svw; + + overflow: scroll; } .trailInfoFrag { @@ -60,62 +60,77 @@ main { border: #000000 solid 2px; border-radius: 10px; box-shadow: 0 5px 20px 0 #000000; - margin:0; - padding:0; + margin: 2svh auto; + width: 70vw; + height: 60svh; animation: fadeIn 3s; - overflow: hidden; - display: flex; - flex-direction: column; - min-width: 30svh; - & h1 { - color: white; + display: grid; + grid-template-areas: + "header header header" + "image text text"; + grid-template-columns: 30% 30% auto; + grid-template-rows: 10% auto; + grid-column-gap: 2vw; + grid-row-gap: 2svh; + & .trailInfoHeader { grid-area: header; - margin: 10px 25%; - font-size: xx-large; - text-align: center; - border-bottom: #1e1e1e solid 2px; - } -} + width: 100%; + height: 100%; + margin-top: 1svh; + padding: 0; + & h1 { + color: white; + padding:0; + margin:0 25%; + font-size: 2vw; + text-align: center; + box-shadow: 0 10px 10px -10px black; + } -#trailFragContent { - margin: 0; - padding: 0; - display: flex; - overflow: hidden; - min-height: 40svh; - max-height: 60svh; + } & img { + grid-area: image; border-radius: 10px; border: black solid 1px; - margin: 1%; - flex: 1 1; - - min-width: 20%; - max-width: 40%; - min-height: 20svh; - max-height: 90%; - overflow: hidden; + margin-left: 2vw; + margin-right: 2vw; + width: 100%; + height: auto; } & p { + grid-area: text; color: white; - flex: 1 1; - padding: 5%; - width: 60%; - border-left: solid darkgrey 2px; - font-size: x-large; + margin: 0; + padding: 0 2vw; + font-size: 1.5vw; text-align: justify; text-justify: inter-character; line-height: 1.5; + width: fit-content; + height: fit-content; + overflow: scroll; + } } +#trailFragContent { + margin: 0; + padding: 0; + display: flex; + min-height: 40svh; + flex-wrap: wrap; + +} + header { box-shadow: #1e1e1e 0 0 10px 10px; + font-size: 1vw; } footer { + font-size: 1vw; position: relative; bottom: 0; } \ No newline at end of file diff --git a/src/main/resources/static/images/trails/trail2.jpg b/src/main/resources/static/images/trails/trail2.jpg index 31e14eae5ac6e1132c33b7161dc2bc5e30c90dcf..683d275abb6772456d55082eb4940d0e606bf5f6 100644 Binary files a/src/main/resources/static/images/trails/trail2.jpg and b/src/main/resources/static/images/trails/trail2.jpg differ diff --git a/src/main/resources/static/images/trails/trail3.jpg b/src/main/resources/static/images/trails/trail3.jpg index 84763490556a7e758d2d56e8b649e051bd7a770d..f02b15249a3f0e2158023b8a98c8bf67fcc272c8 100644 Binary files a/src/main/resources/static/images/trails/trail3.jpg and b/src/main/resources/static/images/trails/trail3.jpg differ diff --git a/src/main/resources/static/images/trails/trail4.jpg b/src/main/resources/static/images/trails/trail4.jpg index c2b43e3a3488a4b4c7105948c4a9903bd15915e0..4d776b5057ff8e7da0e7a33f503be983ab5d9d0a 100644 Binary files a/src/main/resources/static/images/trails/trail4.jpg and b/src/main/resources/static/images/trails/trail4.jpg differ diff --git a/src/main/resources/static/images/trails/trailNotFound.jpg b/src/main/resources/static/images/trails/trailNotFound.jpg index dc106d5033650fe232b4f01d8914a163c4462c75..9fd46288f31cf61cbce2d58244e69b908cf727c1 100644 Binary files a/src/main/resources/static/images/trails/trailNotFound.jpg and b/src/main/resources/static/images/trails/trailNotFound.jpg differ diff --git a/src/main/resources/static/scripts/allTrails.js b/src/main/resources/static/scripts/allTrails.js index 0e5132a7453bee04a1eed08dbcdb5401a68b72f7..e62cd3bbedf582442bf20874e9f877949935db0d 100644 --- a/src/main/resources/static/scripts/allTrails.js +++ b/src/main/resources/static/scripts/allTrails.js @@ -1,7 +1,7 @@ function updateOutputTrail(id) { /* Updates the trail being shown on screen to the one requested by ID */ $.get("/allTrails/" + id).done(function (fragment) { - $("#trailInfoContainer").html(fragment) + $(".trailInfoFrag").replaceWith(fragment); }); updateSelectedTrail(id); } diff --git a/src/main/resources/templates/allTrails/allTrails.html b/src/main/resources/templates/allTrails/allTrails.html index 669020d15507bfcaeb8ca959df108269222ba8ec..4ef7ec3de72bba127c949456a875126ed4951c4f 100644 --- a/src/main/resources/templates/allTrails/allTrails.html +++ b/src/main/resources/templates/allTrails/allTrails.html @@ -2,6 +2,7 @@ <html lang="en"> <head> <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>All Trails</title> <link rel="stylesheet" th:href="@{css/allTrails.css}"> <link rel="stylesheet" th:href="@{css/templatingstyle.css}"> @@ -21,7 +22,7 @@ > </section> - <section id="trailInfoContainer"> + <section id="trailInfoContainer" class="trailInfoFrag"> <h1 class="centerFlex">Please select your trail</h1> <!--Loaded from thymeleaf--> </section> diff --git a/src/main/resources/templates/fragments/allTrailsFrags.html b/src/main/resources/templates/fragments/allTrailsFrags.html index fc4da1492b07e6d7f3004a95554aeae13cf58bcb..7f7f41dba9f99ce028118a4b4da502a6039d6f2d 100644 --- a/src/main/resources/templates/fragments/allTrailsFrags.html +++ b/src/main/resources/templates/fragments/allTrailsFrags.html @@ -1,11 +1,7 @@ <article th:fragment="trailSection" class="trailInfoFrag"> - <h1 th:text="${trail.getName()}"></h1> - - <div id="trailFragContent"> - <img th:src="@{${trail.getImgPath()}}" th:alt="${trail.getName()} "> - <p th:text="${trail.getDescription()}"></p> + <div class="trailInfoHeader"> + <h1 th:text="${trail.getName()}"></h1> </div> - - - <!--TODO add more to this fragment and then add styling to it--> + <img th:src="@{${trail.getImgPath()}}" th:alt="${trail.getName()} "> + <p id="trailDesc" th:text="${trail.getDescription()}"></p> </article>