From 1a70eb8409fac89a1d59d6d3d75ff0e490eaaee5 Mon Sep 17 00:00:00 2001
From: Ingrid Martinsheimen Egge <ingrimeg@stud.ntnu.no>
Date: Fri, 28 Apr 2023 19:23:12 +0200
Subject: [PATCH] knappefarger og cursor
---
cypress/fixtures/exampleItem.json | 10 ++++++++++
src/components/ItemSearch.vue | 1 +
src/views/FridgeView.vue | 14 +++++++++-----
3 files changed, 20 insertions(+), 5 deletions(-)
create mode 100644 cypress/fixtures/exampleItem.json
diff --git a/cypress/fixtures/exampleItem.json b/cypress/fixtures/exampleItem.json
new file mode 100644
index 0000000..fd91203
--- /dev/null
+++ b/cypress/fixtures/exampleItem.json
@@ -0,0 +1,10 @@
+{
+ "item":{
+ "id": "1",
+ "name":"eple",
+ "amount": {"quantity": "4","unit": "stk"},
+ "image_url": ""
+ },
+ "exp_date": "2222-02-22T00:00:00+00:00",
+ "amount": {"quantity": "2","unit": "stk"}
+}
diff --git a/src/components/ItemSearch.vue b/src/components/ItemSearch.vue
index e1c0690..c08c478 100644
--- a/src/components/ItemSearch.vue
+++ b/src/components/ItemSearch.vue
@@ -98,6 +98,7 @@ button {
button:hover {
border: 1px solid base.$grey;
background-color: base.$green;
+ cursor: pointer;
}
diff --git a/src/views/FridgeView.vue b/src/views/FridgeView.vue
index 99b34bf..f5fd1f0 100644
--- a/src/views/FridgeView.vue
+++ b/src/views/FridgeView.vue
@@ -78,7 +78,7 @@ h1 {
#itemContainer {
background-color: base.$grey;
- padding-bottom: 5em;
+ padding-bottom: 5em;
}
#addItemBtn {
@@ -87,19 +87,23 @@ h1 {
border-radius: 50%;
font-size: 30px;
border:none;
- background-color: base.$green;
+ background-color: base.$light-green;
color: white;
box-shadow: 0px 0px 20px rgba(0,0,0,0.3);
}
-#addItemBtn-container {
+#addItemBtn:hover {
+ background-color: base.$green;
+ color: white;
+ box-shadow: 0px 0px 20px rgba(0,0,0,0.5);
+ cursor: pointer;
+}
+#addItemBtn-container {
padding-bottom: 9em;
-
z-index: 9999;
position: fixed;
bottom: 15px;
right: 1em;
}
-
</style>
\ No newline at end of file
--
GitLab