Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • 15
  • 18-as-a-user-i-want-consistent-headers-and-footers-on-each-webpage-so-that-i-can-navigate-the
  • 19-as-a-user-i-want-to-be-able-to-see-a-list-of-specific-landmarks-so-i-can-decide-where-to-go-next
  • 2-as-a-user-i-want-the-style-to-be-reminescent-of-netflix-disney-so-that-it-is-pleasing-the-eye
  • 26-as-a-client-i-want-users-to-be-able-to-store-registration-login-information-so-they-can-resume
  • 27-as-a-user-i-want-to-see-all-trails-across-a-town-and-seamlessly-move-between-them
  • 28-as-a-user-i-want-to-be-able-to-see-landmarks-related-to-the-trail-i-am-looking-at-so-that-i-can
  • 31-as-a-user-i-want-to-be-able-submit-a-form-about-a-specific-landmark-to-add-to-the-trail
  • 32-as-a-developer-i-want-all-landmarks-to-be-stored-together
  • 34-as-a-developer-i-want-to-link-all-data-tables-together-to-streamline-trail-related-data-sets
  • 44-as-a-user-i-want-to-be-able-to-have-the-homepage-being-very-intuitive-and-easy-to-navigate
  • 46-as-a-child-i-want-an-interesting-and-exciting-story-based-trail-with-obvious-landmarks-so-i-can
  • 46-as-a-child-i-want-an-interesting-and-exciting-story-based-trail-with-obvious-landmarks-so-i-can-2
  • 47-as-a-user-i-want-the-website-to-be-mobile-friedly-so-that-i-can-use-it-on-the-go
  • 48-as-a-user-i-want-to-see-a-list-of-all-available-towns-with-trails-so-i-can-plan-where-to-go
  • 49-as-a-trail-chaser-i-want-to-scan-a-qr-code-and-checkpoint-the-landmarks-i-ve-visited-on-seperate
  • 50-as-a-client-i-want-gamification-of-the-badges-so-that-users-remain-engaged
  • 50-as-a-user-i-want-to-be-able-to-log-in
  • 52-as-a-user-i-would-like-to-see-a-map-of-the-landmarks-so-that-i-can-figure-out-where-to-go
  • 68-as-a-user-i-would-like-to-see-a-map-containing-all-landmarks-for-a-trail-and-a-suggested-path
  • 69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can
  • 70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my
  • 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense
  • 74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details
  • 77-as-a-user-i-want-to-be-able-to-use-the-application-on-any-device-e-g-iphone-ipad-laptop
  • 80-as-a-convenience-enthusiast-i-want-a-drop-down-menu-to-be-able-to-quickly-scan-qr-codes-i-find
  • 81-as-a-child-i-want-a-very-flashy-and-modern-looking-webpage-that-will-draw-me-in-and-keep-me
  • 82-as-a-site-admininstrator-i-want-to-be-able-to-review-submited-trail-checkpoints-by-bussiness
  • CaerphillyHeadAndFoot
  • CaerphillyHeadandFoot
  • CaerphillyLandmarks
  • DTFrontEnd
  • Gabes-testing-branch
  • InitialWebPageControllers
  • QRCodes
  • businesses
  • cleanup
  • consumers
  • database
  • databaseList
  • foreignkeys
  • gamification
  • headandfoot
  • headerandfooter
  • locationApporvalFormValidationUpdate
  • main
  • pleaseSQLWork
  • towns
  • wireframes
49 results

Target

Select target project
  • d1634883/client-project
  • d1656298/client-project
2 results
Select Git revision
  • 15
  • 18-as-a-user-i-want-consistent-headers-and-footers-on-each-webpage-so-that-i-can-navigate-the
  • 19-as-a-user-i-want-to-be-able-to-see-a-list-of-specific-landmarks-so-i-can-decide-where-to-go-next
  • 2-as-a-user-i-want-the-style-to-be-reminescent-of-netflix-disney-so-that-it-is-pleasing-the-eye
  • 26-as-a-client-i-want-users-to-be-able-to-store-registration-login-information-so-they-can-resume
  • 27-as-a-user-i-want-to-see-all-trails-across-a-town-and-seamlessly-move-between-them
  • 28-as-a-user-i-want-to-be-able-to-see-landmarks-related-to-the-trail-i-am-looking-at-so-that-i-can
  • 31-as-a-user-i-want-to-be-able-submit-a-form-about-a-specific-landmark-to-add-to-the-trail
  • 32-as-a-developer-i-want-all-landmarks-to-be-stored-together
  • 34-as-a-developer-i-want-to-link-all-data-tables-together-to-streamline-trail-related-data-sets
  • 44-as-a-user-i-want-to-be-able-to-have-the-homepage-being-very-intuitive-and-easy-to-navigate
  • 46-as-a-child-i-want-an-interesting-and-exciting-story-based-trail-with-obvious-landmarks-so-i-can
  • 46-as-a-child-i-want-an-interesting-and-exciting-story-based-trail-with-obvious-landmarks-so-i-can-2
  • 47-as-a-user-i-want-the-website-to-be-mobile-friedly-so-that-i-can-use-it-on-the-go
  • 48-as-a-user-i-want-to-see-a-list-of-all-available-towns-with-trails-so-i-can-plan-where-to-go
  • 49-as-a-trail-chaser-i-want-to-scan-a-qr-code-and-checkpoint-the-landmarks-i-ve-visited-on-seperate
  • 50-as-a-client-i-want-gamification-of-the-badges-so-that-users-remain-engaged
  • 50-as-a-user-i-want-to-be-able-to-log-in
  • 52-as-a-user-i-would-like-to-see-a-map-of-the-landmarks-so-that-i-can-figure-out-where-to-go
  • 68-as-a-user-i-would-like-to-see-a-map-containing-all-landmarks-for-a-trail-and-a-suggested-path
  • 69-as-a-user-i-would-like-a-town-specific-page-which-shows-all-trails-for-that-town-so-that-i-can
  • 70-as-a-repeat-trail-visitor-i-want-to-be-able-to-create-an-account-so-i-can-save-and-review-my
  • 73-as-a-qr-scanning-connoisseur-i-want-to-unlock-stickers-after-scanning-a-qr-code-to-feel-a-sense
  • 74-as-a-user-i-want-to-see-a-page-of-local-authorities-so-that-i-can-easily-source-contact-details
  • 77-as-a-user-i-want-to-be-able-to-use-the-application-on-any-device-e-g-iphone-ipad-laptop
  • 80-as-a-convenience-enthusiast-i-want-a-drop-down-menu-to-be-able-to-quickly-scan-qr-codes-i-find
  • 81-as-a-child-i-want-a-very-flashy-and-modern-looking-webpage-that-will-draw-me-in-and-keep-me
  • 82-as-a-site-admininstrator-i-want-to-be-able-to-review-submited-trail-checkpoints-by-bussiness
  • CaerphillyHeadAndFoot
  • CaerphillyHeadandFoot
  • CaerphillyLandmarks
  • DTFrontEnd
  • Gabes-testing-branch
  • InitialWebPageControllers
  • QRCodes
  • businesses
  • cleanup
  • consumers
  • database
  • databaseList
  • foreignkeys
  • gamification
  • headandfoot
  • headerandfooter
  • locationApporvalFormValidationUpdate
  • main
  • pleaseSQLWork
  • towns
  • wireframes
49 results
Show changes
Commits on Source (3)
Hide whitespace changes
Inline Side-by-side
src/main/resources/static/css/allTrails.css
View file @ 0354d008
...@@ -2,13 +2,22 @@ ...@@ -2,13 +2,22 @@
box-sizing: border-box; box-sizing: border-box;
} }
body { body {
background-color: rgb(41, 41, 41); /*background-color: rgb(41, 41, 41);*/
background-color: #40116b;
margin: 0; margin: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
min-height: 100svh; min-height: 100svh;
} }
main { main {
background-color: rgba(41, 41, 41, 0.84);
width: 95vw;
border-radius: 2vw;
margin: auto;
margin-top: 2svh;
padding-top: 4svh;
padding-bottom: 4svh;
box-shadow: rgba(0, 0, 0, 0.51) 0 0 30px;
} }
.centerFlex { .centerFlex {
...@@ -47,15 +56,6 @@ main { ...@@ -47,15 +56,6 @@ main {
0% { opacity: 0; } 0% { opacity: 0; }
100% { opacity: 1; } 100% { opacity: 1; }
} }
main {
margin: 0;
}
#trailInfoContainer {
overflow: scroll;
}
.trailInfoFrag { .trailInfoFrag {
background-color: rgb(84, 33, 128); background-color: rgb(84, 33, 128);
border: #000000 solid 2px; border: #000000 solid 2px;
...@@ -114,7 +114,6 @@ main { ...@@ -114,7 +114,6 @@ main {
line-height: 1.5; line-height: 1.5;
width: fit-content; width: fit-content;
height: fit-content; height: fit-content;
overflow: scroll;
} }
} }
...@@ -128,7 +127,7 @@ main { ...@@ -128,7 +127,7 @@ main {
} }
header { /*header {*/
box-shadow: #1e1e1e 0 0 10px 10px; /* box-shadow: #1e1e1e 0 0 10px 10px;*/
font-size: 1vw; /* font-size: 1vw;*/
} /*}*/
src/main/resources/static/css/templatingstyle.css
View file @ 0354d008
body {
/*background-color: rgb(41, 41, 41);*/
background-color: #40116b;
margin: 0;
display: flex;
flex-direction: column;
min-height: 100svh;
}
main {
background-color: rgba(41, 41, 41, 0.84);
width: 95vw;
border-radius: 2vw;
margin: 4svh auto;
padding-top: 4svh;
padding-bottom: 4svh;
box-shadow: rgba(0, 0, 0, 0.51) 0 0 30px;
}
/* Header */ /* Header */
.headerBar { .headerBar {
border-bottom: 2px rgb(230, 230, 230) solid; /*border-bottom: 2px rgb(230, 230, 230) solid;*/
margin-bottom: 20px; margin-bottom: 20px;
display: flex; display: flex;
background-color: rgb(84, 33, 128);
} }
/* Navbar Links */ /* Navbar Links */
.navBar { .navBar {
display:flex;
flex-direction: column;
margin: 2svh 1vw 2svh auto; margin: 2svh 1vw 2svh auto;
text-align: right; text-align: right;
align-content: center;
background-color: rgba(41, 41, 41, 0.5);
box-shadow: rgba(0, 0, 0, 0.51) 0 0 30px;
border-radius: 1vw;
padding:0;
& select {
margin-left: 5vw;
margin-right: 0.5vw;
}
} }
.work{ .work{
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
margin-left: 5vw;
margin-right: 0.5vw;
} }
.navBar ul { .navBar ul {
list-style: none; list-style: none;
display: flex; display: flex;
margin-left: 100px; margin-left: 5vw;
& li {
background-color: #36454F;
border-radius: 1vw;
padding: 0.5vw;
box-shadow: rgba(0, 0, 0, 0.51) 0 0 5px;
}
} }
.navBar a { .navBar a {
/*border-left: 2px rgb(185, 185, 185) solid;*/
/*padding: 10px 40px;*/
padding-left:5px ;padding-right: 5px; padding-left:5px ;padding-right: 5px;
text-decoration: none; text-decoration: none;
/*color:rgb(87, 86, 86);*/
/*// original color*/
color:white; color:white;
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
float: right; float: right;
} }
.navBar a:hover { .navBar ul li:hover {
background-color: rgb(209, 209, 209); background-color: rgb(209, 209, 209);
} }
.navBar li{ .navBar li{
...@@ -51,10 +85,14 @@ ...@@ -51,10 +85,14 @@
margin-left:10px; margin-left:10px;
padding: 20px; padding: 20px;
width: fit-content; width: fit-content;
}
.Logo img { & img {
width: 120px; width: 120px;
margin-left:15px; margin-left:15px;
box-shadow: rgba(0, 0, 0, 0.51) 0 0 30px;
border-radius: 1vw;
}
} }
/* Footer */ /* Footer */
...@@ -62,17 +100,18 @@ footer { ...@@ -62,17 +100,18 @@ footer {
margin-top:auto; margin-top:auto;
display: flex; display: flex;
justify-content: center; justify-content: center;
background-color: rgb(84, 33, 128); margin: 0 2vw;
border-top: 2px rgb(230, 230, 230) solid; /*background-color: rgb(84, 33, 128);*/
/*border-top: 2px rgb(230, 230, 230) solid;*/
font-size: 1vw; font-size: 1vw;
} }
.footerBar{ .footerBar{
flex: 1 1;
text-align: left; text-align: left;
display: flex; display: flex;
margin: 0;
padding: 0;
color: rgb(255, 255, 255); color: rgb(255, 255, 255);
padding-left: 30px;
} }
.footerBar ul { .footerBar ul {
list-style: none; list-style: none;
...@@ -84,21 +123,33 @@ footer { ...@@ -84,21 +123,33 @@ footer {
} }
.containerFooter{ .containerFooter{
display: flex; display: flex;
flex-direction: row; flex: 1 1;
} width: 80%;
.leftFooter{ justify-content: space-between;
flex:1; border-radius: 1vw;
color: rgb(255, 255,255); background-color: rgba(58, 58, 0, 0.81);
} padding-top: 1svh;
.centerFooter{ padding-bottom: 1svh;
flex: 1; & ul li{
color: rgb(255, 255,255); flex:1;
} color: rgb(255, 255,255);
.rightFooter{
flex:1; }
color: rgb(255, 255, 255);
} }
/*.leftFooter{*/
/* flex:1;*/
/* color: rgb(255, 255,255);*/
/*}*/
/*.centerFooter{*/
/* flex: 1;*/
/* color: rgb(255, 255,255);*/
/*}*/
/*.rightFooter{*/
/* flex:1;*/
/* color: rgb(255, 255, 255);*/
/*}*/
/*CHANGES*/ /*CHANGES*/
.headerBar, .footerBar{ .headerBar, .footerBar{
......
src/main/resources/templates/towns/Templating.html
View file @ 0354d008
...@@ -23,22 +23,22 @@ ...@@ -23,22 +23,22 @@
</header> </header>
<div class="footerBar" th:fragment="footer"> <div class="footerBar" th:fragment="footer">
<div class="containerFooter"> <ul class="containerFooter">
<div class="leftFooter"> <li class="leftFooter">
<h3>VZTA</h3> <h3>VZTA</h3>
Near Me Now LTD Near Me Now LTD
<br>Britania House <br>Britania House
<br>Caerphilly Business Park <br>Caerphilly Business Park
<br>Caerphilly <br>Caerphilly
<br>CF83 3GG <br>CF83 3GG
</div> </li>
<div class="rightFooter"> <li class="rightFooter">
<h3>Connect with us</h3> <h3>Connect with us</h3>
<p>Be the first to know about updates by joining out Community page</p> <p>Be the first to know about updates by joining out Community page</p>
(C) VZTA 2022<br> (C) VZTA 2022<br>
Policy Terms and Conditions Policy Terms and Conditions
</div> </li>
<div class="centerFooter"> <li class="centerFooter">
<span class="footerText"> <span class="footerText">
<h3>Follow Us</h3> <h3>Follow Us</h3>
<a href="https://www.facebook.com/VZTAsmarttowns/" class="icon"><img src="/images/Facebook.png" height="25" width="25" alt="Facebook Logo" class="icon"/></a> <a href="https://www.facebook.com/VZTAsmarttowns/" class="icon"><img src="/images/Facebook.png" height="25" width="25" alt="Facebook Logo" class="icon"/></a>
...@@ -46,11 +46,10 @@ ...@@ -46,11 +46,10 @@
<a href="https://www.instagram.com/vztasmarttowns/" class="icon"><img src="/images/Instagram.jpg" height="25" width="25" alt="Instagram Logo" class="icon"/></a> <a href="https://www.instagram.com/vztasmarttowns/" class="icon"><img src="/images/Instagram.jpg" height="25" width="25" alt="Instagram Logo" class="icon"/></a>
<a href="https://www.linkin.com/company/vztasmarttowns/" class="icon"><img src="/images/Linkedin.png" height="25" width="25" alt="Linkedin Logo" class="icon"/></a><br> <a href="https://www.linkin.com/company/vztasmarttowns/" class="icon"><img src="/images/Linkedin.png" height="25" width="25" alt="Linkedin Logo" class="icon"/></a><br>
</span> </span>
</div> </li>
<div class="copyright" style="text-align: left"> <li class="copyright" style="text-align: left">
</div> </li>
</div> </ul>
</div>
</div> </div>
<!--&gt;>>>>>> main--> <!--&gt;>>>>>> main-->