From 108ecef39ff097356b6ae1d328171781e4fe5e93 Mon Sep 17 00:00:00 2001
From: c2065864 <barnards3@cardiff.ac.uk>
Date: Thu, 9 Dec 2021 17:08:58 +0000
Subject: [PATCH] Removed borders on email fields
---
src/main/resources/static/css/manageStaff.css | 4 ++++
src/main/resources/static/js/manageStaff.js | 4 ++--
src/main/resources/templates/fragments/manageStaff.html | 7 +++----
src/main/resources/templates/fragments/userSocials.html | 2 +-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/static/css/manageStaff.css b/src/main/resources/static/css/manageStaff.css
index 74dbe05..4f8d804 100644
--- a/src/main/resources/static/css/manageStaff.css
+++ b/src/main/resources/static/css/manageStaff.css
@@ -11,3 +11,7 @@
justify-content: space-between;
align-items: center;
}
+
+.staffManagementContainer:last-child{
+ border-bottom: none!important;
+}
diff --git a/src/main/resources/static/js/manageStaff.js b/src/main/resources/static/js/manageStaff.js
index 0008473..a4ec17b 100644
--- a/src/main/resources/static/js/manageStaff.js
+++ b/src/main/resources/static/js/manageStaff.js
@@ -46,7 +46,7 @@ function submit(shopId, email={"value":""}){
document.getElementById("staffManagement").innerHTML+=
`<div id="staffManagement">
<div class="staffManagementContainer">
- <p class="subtitle is-6" name="staffEmail" style="width:50%; margin-bottom: 0">${emailValue}</p>
+ <p class="subtitle is-6 staffEmail" name="staffEmail" style="width:80%; margin-bottom: 0">${emailValue}</p>
<button class="button is-danger is-outlined" style="border-bottom: 1px solid"
onclick="submit(${document.getElementById("shopId").value},this);">
<span class="icon is-small">
@@ -54,7 +54,7 @@ function submit(shopId, email={"value":""}){
</span>
</button>
</div>
- <p id="blackLine" class="subtitle is-6" style="border-bottom: 1px solid #00b89c; margin-bottom:1%; width:50%"></p>
+ <p id="blackLine" class="subtitle is-6" style="border-bottom: 1px solid; margin-bottom:1%; width:50%"></p>
</div>`
}
diff --git a/src/main/resources/templates/fragments/manageStaff.html b/src/main/resources/templates/fragments/manageStaff.html
index 4342cee..e9afec5 100644
--- a/src/main/resources/templates/fragments/manageStaff.html
+++ b/src/main/resources/templates/fragments/manageStaff.html
@@ -21,15 +21,14 @@
<p><br>Current Admins</p>
<div id="staffManagement"></div>
<div id="staffManagement" th:each="user : ${staffMembers}">
- <div class="staffManagementContainer">
- <p class="subtitle is-6" name="staffEmail" th:text="${user.userEmail}" style="width:50%; margin-bottom: 0"></p>
- <button class="button is-danger is-outlined" style="border-bottom: 1px solid black" th:onclick="'submit('+${shop.shopId}+',this);'">
+ <div class="staffManagementContainer" style="margin-bottom:1%;">
+ <p class="subtitle is-6 staffEmail" name="staffEmail" th:text="${user.userEmail}" style="width:80%; margin-bottom: 0"></p>
+ <button class="button is-danger is-outlined" th:onclick="'submit('+${shop.shopId}+',this);'">
<span class="icon is-small">
<i class="fas fa-times is-danger"></i>
</span>
</button>
</div>
- <p id="blackLine" class="subtitle is-6" style="border-bottom: 1px solid #00b89c; margin-bottom:1%; width:50%"> </p>
</div>
<input id="shopId" class="input is-hidden" th:value="${shop.shopId}">
diff --git a/src/main/resources/templates/fragments/userSocials.html b/src/main/resources/templates/fragments/userSocials.html
index 029ab41..4a9c7be 100644
--- a/src/main/resources/templates/fragments/userSocials.html
+++ b/src/main/resources/templates/fragments/userSocials.html
@@ -81,7 +81,7 @@
</div>
<button class="button is-link" style="margin-top: 5px" th:onclick="'send('+${shop.shopId}+');'">Save changes</button>
</div>
-<p style="border-bottom: 1px solid #00b89c;"><br></p>
+<p style="border-bottom: 1px solid;"><br></p>
</body>
--
GitLab