diff --git a/src/main/resources/static/css/home/home.css b/src/main/resources/static/css/home/home.css index 1694ebbdf2ebaf8a8729a7c1315737c4e3322c58..b46b104575eadcda03983cfa1b6a1a6b0103dae6 100644 --- a/src/main/resources/static/css/home/home.css +++ b/src/main/resources/static/css/home/home.css @@ -4,6 +4,7 @@ section { display: flex; flex-direction: column; align-items: center; + margin-bottom: 30px; } @@ -55,6 +56,7 @@ button:hover { display: flex; flex-direction: column; justify-content: space-between; /* Space out the content inside the tile */ + transition:transform ease-in-out; } /* Logo and title container */ @@ -97,8 +99,12 @@ button:hover { height: 100%; /* Ensures the link takes full height of the tile */ } +.tile:hover{ + transform: scale(1.03); +} + .tileLink:hover { - background-color: #f0f0f0; /* Light background on hover */ + /*background-color: #f0f0f0; !* Light background on hover *!*/ border-radius: 10px; transition: background-color 0.3s ease; } diff --git a/src/main/resources/static/css/information/infoStyles.css b/src/main/resources/static/css/information/infoStyles.css index 90202542e152c378d66fd96c922ca57d0c942ea6..6664154b3d0d82d936883e7e27a98242c81f98f9 100644 --- a/src/main/resources/static/css/information/infoStyles.css +++ b/src/main/resources/static/css/information/infoStyles.css @@ -1,7 +1,5 @@ *{ box-sizing: border-box; - font-family: "Roboto", serif; - /*font-family:'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif*/ } diff --git a/src/main/resources/static/css/layout/layout.css b/src/main/resources/static/css/layout/layout.css index d5e14947d5224ce34fc41ecd7de8620af43363bb..8007843d0c139c520ea086c0231d4206b81a3f3b 100644 --- a/src/main/resources/static/css/layout/layout.css +++ b/src/main/resources/static/css/layout/layout.css @@ -221,6 +221,10 @@ nav.sidebar { /* ACCOUNT OPTIONS STYLING */ /* Dropdown styles */ +#account-options { + cursor: pointer; +} + .dropdown { position: relative; display: inline-block; @@ -230,9 +234,11 @@ nav.sidebar { display: none; position: absolute; background-color: #f9f9f9; - min-width: 160px; + min-width: 100px; box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); z-index: 1; + right: 50px; + top: 60px; } .dropdown-content a { @@ -250,5 +256,9 @@ nav.sidebar { display: block; } +.proficon { + width: 20px; + height: 20px; +} /* ACCOUNT OPTIONS STYLING END */ \ No newline at end of file diff --git a/src/main/resources/static/css/register/register.css b/src/main/resources/static/css/register/register.css index fce9b8317fa68725866157c3baa1d42ed818a9b4..c22230e171a87a62379f4aa2d52b101dd63a6065 100644 --- a/src/main/resources/static/css/register/register.css +++ b/src/main/resources/static/css/register/register.css @@ -1,14 +1,11 @@ /* General Styles */ -body { - font-family: Arial, sans-serif; - background-color: #f9f9f9; - margin: 0; +section { padding: 0; display: flex; flex-direction: column; align-items: center; justify-content: center; - height: 100vh; + margin-bottom: 30px; } /* Title */ diff --git a/src/main/resources/templates/information/information.html b/src/main/resources/templates/information/information.html index 37c2ee57f7161670c274485e27b0052b9d992e55..557dc108d20b4079cac8ca4fbd148121b6625cd1 100644 --- a/src/main/resources/templates/information/information.html +++ b/src/main/resources/templates/information/information.html @@ -1,6 +1,8 @@ <!DOCTYPE html> <html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" - layout:decorate="~{layout/layout}"> + layout:decorate="~{layout/layout}" + xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity6" +> <head> <meta charset="UTF-8"> <!--Custom styles--> @@ -24,7 +26,7 @@ <h1 th:text="${selectedInfo.getInfoTitle()}">Information Title</h1> </section> <aside class="sub-head-edit-container"> - <a id="editButtonLink" th:href="@{/info/edit/{id} (id=${selectedInfo.getInformationId()})}"> + <a id="editButtonLink" th:href="@{/info/edit/{id} (id=${selectedInfo.getInformationId()})}" sec:authorize="isAuthenticated()" > <button><strong>Edit</strong></button></a> </aside> </section> diff --git a/src/main/resources/templates/layout/layout.html b/src/main/resources/templates/layout/layout.html index 829aeca235d83698170723c179cdbc3c662c0401..a0b12604b0a2a184319d48b2afae4ff2001f1f53 100644 --- a/src/main/resources/templates/layout/layout.html +++ b/src/main/resources/templates/layout/layout.html @@ -72,7 +72,7 @@ <!-- Profile --> <div id="account-options"> <div sec:authorize="isAnonymous()"> - <img src="/assets/navbarImages/profile.png" class="navIcons anonymous"> + <img src="/assets/navbarImages/profile.png" class="navIcons anonymous proficon"> <span class="navText">Sign in</span> <div class="dropdown-content"> <a class="dropdown-nav-link" th:href="@{/login}">Login</a> @@ -80,7 +80,7 @@ </div> </div> <div sec:authorize="isAuthenticated()"> - <img src="/assets/navbarImages/profile.png" class="navIcons authenticated"> + <img src="/assets/navbarImages/profile.png" class="navIcons authenticated proficon"> <span class="navText"data-translate-key="navbar.profile">Profile</span> <div class="dropdown-content"> <a class="navLink" th:href="@{/profile}">View profile</a> @@ -124,10 +124,6 @@ <a href="#" class="social-icon"><img src="/assets/navbarImages/instagram.png" alt="Instagram"></a> </div> </div> - - <div class="footer-section copyright"> - <p class="footerCompanyName">© LUDEK PCG ltd. <span data-translate-key="footer.all_rights_reserved" >All rights reserved.</span></p> - </div> </footer> <script src="/js/layout/layout.js" defer></script> <script th:replace="~{comments/commentFragment::commentScript}"></script> diff --git a/src/main/resources/templates/register/register.html b/src/main/resources/templates/register/register.html index 87bd84f6a24a084bbec0c49992132737da7a2924..7f4f065a3c0ca8b7c9d49b4470af98379429db05 100644 --- a/src/main/resources/templates/register/register.html +++ b/src/main/resources/templates/register/register.html @@ -9,10 +9,10 @@ <script src="/js/register/register.js" defer></script> </head> -<body> +<section layout:fragment="content"> <h1>Create an Account</h1> - <div class="registerContainer" layout:fragment="content"> + <div class="registerContainer" > <!-- The form is bound to the 'user' object --> <form th:action="@{/register}" th:method="post" th:object="${user}" class="registerForm"> @@ -50,12 +50,12 @@ <input type="date" id="dob" name="dob" required> </div> - <div class="registerField"> - <label for="roleId">Role</label> - <select name="roleId"> - <option th:each="role : ${roles}" th:value="${role.id}" th:text="${role.name}"></option> - </select> - </div> +<!-- <div class="registerField">--> +<!-- <label for="roleId" >Role</label>--> +<!-- <select name="roleId">--> +<!-- <option th:each="role : ${roles}" th:value="${role.id}" th:text="${role.name}"></option>--> +<!-- </select> --> +<!-- </div>--> <div class="termsField"> <input type="checkbox" id="agreeTerms" required> @@ -75,5 +75,5 @@ </form> </div> -</body> +</section> </html>