From d2118affef16c39c6be9e0940e5e6a1488141ce8 Mon Sep 17 00:00:00 2001
From: Titus Kristiansen <titusk@stud.ntnu.no>
Date: Wed, 27 Apr 2022 09:50:04 +0200
Subject: [PATCH] Update LoginForm.vue
---
src/components/LoginForm.vue | 70 ------------------------------------
1 file changed, 70 deletions(-)
diff --git a/src/components/LoginForm.vue b/src/components/LoginForm.vue
index ed192bb..47d0b38 100644
--- a/src/components/LoginForm.vue
+++ b/src/components/LoginForm.vue
@@ -164,73 +164,3 @@ export default {
},
},
};
-</script>
-<<<<<<< src/components/LoginForm.vue
-
-<style scoped>
-.loginForm {
- background-color: white;
- border-radius: 10px;
- margin: auto;
- width: 80%;
- margin-top: 20%;
- justify-content: center;
- padding: 10px;
- font-size: 18px;
-}
-.label {
- float: left;
- margin-left: 5%;
-}
-.loginInputs {
- background-color: #c4c4c4;
- border-radius: 5px;
- width: 90%;
- height: 40px;
- padding: 5px;
-}
-.loginButton {
- width: 55%;
- height: 50px;
- background-color: #1071b8;
- color: white;
- border-radius: 10px;
- justify-content: center;
- text-align: center;
- margin: auto;
- font-size: 25px;
- margin-bottom: 20px;
-}
-.loginButton:disabled {
- opacity: 50%;
- cursor: not-allowed;
-}
-.buttonLink {
- margin: auto;
- text-align: center;
- margin-bottom: 40px;
-}
-.image {
- width: 45%;
- margin: auto;
- margin-top: 20px;
-}
-#forgottenPasswordLink {
- float: right;
- margin: 10px 5% 0 0;
-}
-
-#newUserLink {
- text-decoration: none;
- margin-bottom: 40px;
-}
-.inputFields {
- margin: auto;
- text-align: center;
-}
-.input-errors {
- color: red;
-}
-</style>
-=======
->>>>>>> src/components/LoginForm.vue
--
GitLab