Skip to content

Commit

Permalink
Merge pull request #82 from TeamSevenWeb/change-styles-for-login-page
Browse files Browse the repository at this point in the history
Fields now use simple input style
  • Loading branch information
amechkarov authored Mar 18, 2024
2 parents 58d76b3 + 9ddb0de commit 63434a4
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 21 deletions.
16 changes: 15 additions & 1 deletion src/main/resources/static/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -2328,16 +2328,30 @@ header{
.w-10{
width: 10%;
}

.w-70{
width: 70%;
}

.w-8{
width: 8%;
}
.w-5{
width: 5%;
}

.pd-l-3{
.marg-l-3{
margin-left: 3rem ;
}

.marg-l-2em{
margin-left: 2.5em ;
}

.marg-l-1em{
margin-left: 1.5em ;
}

.centered-error {
position: fixed;
left: 50%; /* Center horizontally */
Expand Down
10 changes: 5 additions & 5 deletions src/main/resources/templates/LoginView.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
<form class="outline login-container" action="#" th:action="@{/auth/login}" th:object="${login}" method="post">
<label class="font-aquire" th:text="#{user.label.username}">Username</label>
<br/>
<input type="text" th:field="*{username}"/><br/>
<div class="error error-login" th:errors="*{username}">Username error placeholder</div>
<input class="simple-input-style w-70 marg-l-2em" type="text" th:field="*{username}"/><br/>
<div class="error error-login marg-l-1em" th:errors="*{username}">Username error placeholder</div>

<label class="font-aquire" th:text="#{user.label.password}">Password</label>
<br/>
<input type="password" th:field="*{password}"/>
<div class="error error-login" th:errors="*{password}">Password error placeholder</div>
<input class="simple-input-style w-70 marg-l-2em" type="password" th:field="*{password}"/>
<div class="error error-login marg-l-1em" th:errors="*{password}">Password error placeholder</div>
<br/>
<div class="login-button">
<input class="py-3 rounded" type="submit" value="Login"/>
<input class="py-3 rounded font-aquire" type="submit" value="Login"/>
</div>
</form>
</div>
Expand Down
30 changes: 15 additions & 15 deletions src/main/resources/templates/RegisterView.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,41 +11,41 @@
<form class="outline login-container" action="#" th:action="@{/auth/register}" th:object="${register}" method="post">
<label class="font-aquire" th:text="#{user.label.username}">Username</label>
<br/>
<input type="text" th:field="*{username}"/><br/>
<div class="error error-login" th:errors="*{username}">Username error placeholder</div>
<input class="simple-input-style marg-l-2em w-70" type="text" th:field="*{username}"/><br/>
<div class="error error-login marg-l-1em" th:errors="*{username}">Username error placeholder</div>

<label class="font-aquire" th:text="#{user.label.password}">Password</label>
<br/>
<input type="password" th:field="*{password}"/><br/>
<div class="error error-login" th:errors="*{password}">Password error placeholder</div>
<input class="simple-input-style marg-l-2em w-70" type="password" th:field="*{password}"/><br/>
<div class="error error-login marg-l-1em" th:errors="*{password}">Password error placeholder</div>

<label class="font-aquire" th:text="#{user.label.confirm.password}">Confirm Password</label>
<br/>
<input type="password" th:field="*{passwordConfirm}"/><br/>
<div class="error error-login" th:errors="*{passwordConfirm}">Password confirm error placeholder</div>
<input class="simple-input-style marg-l-2em w-70" type="password" th:field="*{passwordConfirm}"/><br/>
<div class="error error-login marg-l-1em" th:errors="*{passwordConfirm}">Password confirm error placeholder</div>

<label class="font-aquire" th:text="#{user.label.first-name}">First Name</label>
<br/>
<input type="text" th:field="*{firstName}"/><br/>
<div class="error error-login" th:errors="*{firstName}">First name error placeholder</div>
<input class="simple-input-style marg-l-2em w-70" type="text" th:field="*{firstName}"/><br/>
<div class="error error-login marg-l-1em" th:errors="*{firstName}">First name error placeholder</div>

<label class="font-aquire" th:text="#{user.label.last-name}">Last Name</label>
<br/>
<input type="text" th:field="*{lastName}"/><br/>
<div class="error error-login" th:errors="*{lastName}">Last name error placeholder</div>
<input class="simple-input-style marg-l-2em w-70" type="text" th:field="*{lastName}"/><br/>
<div class="error error-login marg-l-1em" th:errors="*{lastName}">Last name error placeholder</div>

<label class="font-aquire" th:text="#{user.label.email}">Email</label>
<br/>
<input type="text" th:field="*{email}"/><br/>
<div class="error error-login" th:errors="*{email}">Email</div>
<input class="simple-input-style marg-l-2em w-70" type="text" th:field="*{email}"/><br/>
<div class="error error-login marg-l-1em" th:errors="*{email}">Email</div>


<label class="font-aquire" th:text="#{user.label.phone}">Phone</label>
<br/>
<input type="text" th:field="*{phoneNumber}"/><br/>
<div class="error error-login" th:errors="*{phoneNumber}">Phone number</div>
<input class="simple-input-style marg-l-2em w-70" type="text" th:field="*{phoneNumber}"/><br/>
<div class="error error-login marg-l-1em" th:errors="*{phoneNumber}">Phone number</div>
<div class="login-button">
<input class="py-3 rounded" type="submit" value="Register"/>
<input class="py-3 rounded font-aquire" type="submit" value="Register"/>
</div>
</form>
</div>
Expand Down

0 comments on commit 63434a4

Please sign in to comment.