From 81cc9e9c61dcbee2dcb5928f2569cb9cf49912cf Mon Sep 17 00:00:00 2001
From: ingrid <ingrimeg@stud.ntnu.no>
Date: Mon, 24 Apr 2023 14:35:02 +0200
Subject: [PATCH] =?UTF-8?q?sm=C3=A5justeringer=20css:=20layout=20og=20farg?=
=?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 2 ++
src/assets/main.css | 1 -
src/style.scss | 1 +
src/views/LoginView.vue | 9 +++++++--
src/views/SelectProfileView.vue | 4 ++--
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 4ac04cb..bd2caeb 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,8 @@
<script setup>
import { RouterLink, RouterView } from 'vue-router'
import Navbar from "@/components/Navbar.vue";
+
+
</script>
<template>
diff --git a/src/assets/main.css b/src/assets/main.css
index 3c0a06b..2d624bc 100644
--- a/src/assets/main.css
+++ b/src/assets/main.css
@@ -29,7 +29,6 @@ a,
#app {
display: grid;
- grid-template-columns: 1fr 1fr;
padding: 0 2rem;
}
}
diff --git a/src/style.scss b/src/style.scss
index 438fccd..df31d23 100644
--- a/src/style.scss
+++ b/src/style.scss
@@ -1,5 +1,6 @@
/*APP COLORS*/
$green: #00663C;
+$light-green: hsla(160, 100%, 37%, 1);
$white:#FFFFFF;
$grey:#D9D9D9;
$red:#EE6D6D;
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index 1a6a64b..e1593a5 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -51,7 +51,7 @@
</main>
</template>
-<style>
+<style lang="scss">
.login-container {
display: flex;
@@ -87,7 +87,7 @@ label {
}
#login-button {
- background-color: #00663C;
+ background-color: base.$green;
color: #FFFFFF;
border-radius: 5px;
border-style: none;
@@ -98,6 +98,11 @@ label {
margin: 20px;
}
+#login-button:hover {
+ background-color: base.$light-green;
+
+}
+
#logo {
width: 100px;
height: 100px;
diff --git a/src/views/SelectProfileView.vue b/src/views/SelectProfileView.vue
index 6dc0b9f..d8c581f 100644
--- a/src/views/SelectProfileView.vue
+++ b/src/views/SelectProfileView.vue
@@ -55,7 +55,7 @@
</template>
-<style scoped>
+<style scoped lang="scss">
.container {
display: flex;
@@ -87,7 +87,7 @@
}
.icon:hover {
- background-color: #d5d5d5;
+ background-color: base.$grey;
border-radius: 10%;
}
--
GitLab