From 6480f97c9bc84298afd1b12bef4e2bd7f7524198 Mon Sep 17 00:00:00 2001
From: Gilgard <Hjelljord.alida@gmail.com>
Date: Mon, 2 May 2022 08:53:13 +0200
Subject: [PATCH] Updated views
---
src/components/BaseComponents/IconButton.vue | 2 +-
src/components/ChatComponents/ChatMessage.vue | 2 +-
.../CommunityComponents/NewCommunityForm.vue | 14 +++++------
.../CommunityComponents/NewItemForm.vue | 24 +++++++++----------
.../CommunityComponents/SearchItemList.vue | 2 +-
.../LargeProfileCard.vue | 2 +-
.../UserProfileComponents/Rating.vue | 2 +-
7 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/src/components/BaseComponents/IconButton.vue b/src/components/BaseComponents/IconButton.vue
index 4bacbdf..973f04c 100644
--- a/src/components/BaseComponents/IconButton.vue
+++ b/src/components/BaseComponents/IconButton.vue
@@ -1,7 +1,7 @@
<template>
<!-- Icon button -->
<button
- class="block w-fit text-white text-base bg-blue-700 hover:bg-blue-800 focus:ring-4 focus:outline-none focus:ring-blue-300 font-medium rounded-lg text-center dark:bg-blue-600 dark:hover:bg-blue-700 dark:focus:ring-blue-800"
+ class="block w-fit text-white text-base bg-primary-medium hover:bg-primary-dark focus:ring-4 focus:outline-none focus:ring-primary-light font-medium rounded-lg text-center dark:bg-primary-medium dark:hover:bg-primary-dark dark:focus:ring-primary-dark"
>
<div class="flex flex-row px-5 py-2.5 h-10">
<!-- Icon slot: Default content "Ban"-icon -->
diff --git a/src/components/ChatComponents/ChatMessage.vue b/src/components/ChatComponents/ChatMessage.vue
index d3e016a..7ba2ab4 100644
--- a/src/components/ChatComponents/ChatMessage.vue
+++ b/src/components/ChatComponents/ChatMessage.vue
@@ -34,7 +34,7 @@ export default {
methods: {
color() {
console.log(this.userID);
- return this?.message.from == this.userID ? "bg-gray-300" : "bg-blue-600";
+ return this?.message.from == this.userID ? "bg-gray-300" : "bg-primary-medium";
},
textColor() {
return this?.message.from == this.userID ? "text-gray-900" : "text-white";
diff --git a/src/components/CommunityComponents/NewCommunityForm.vue b/src/components/CommunityComponents/NewCommunityForm.vue
index bb3a4d8..932ee11 100644
--- a/src/components/CommunityComponents/NewCommunityForm.vue
+++ b/src/components/CommunityComponents/NewCommunityForm.vue
@@ -66,11 +66,11 @@
<!-- error message for title-->
<div
- class="text-red"
+ class="text-error"
v-for="(error, index) of v$.group.name.$errors"
:key="index"
>
- <div class="text-red-600 text-sm">
+ <div class="text-error text-sm">
{{ error.$message }}
</div>
</div>
@@ -91,11 +91,11 @@
<!-- error message for place-->
<div
- class="text-red"
+ class="text-error"
v-for="(error, index) of v$.group.place.$errors"
:key="index"
>
- <div class="text-red-600 text-sm">
+ <div class="text-error text-sm">
{{ error.$message }}
</div>
</div>
@@ -118,11 +118,11 @@
<!-- error message for description -->
<div
- class="text-red"
+ class="text-error"
v-for="(error, index) of v$.group.description.$errors"
:key="index"
>
- <div class="text-red-600 text-sm">
+ <div class="text-error text-sm">
{{ error.$message }}
</div>
</div>
@@ -148,7 +148,7 @@
<!-- Button for adding an image -->
<div class="inline-flex rounded-md shadow-sm">
- <div class="text-red-500 uppercase text-center">
+ <div class="text-error uppercase text-center">
midlertidig fjernet
</div>
<!-- <button
diff --git a/src/components/CommunityComponents/NewItemForm.vue b/src/components/CommunityComponents/NewItemForm.vue
index 9324b2b..aef1b49 100644
--- a/src/components/CommunityComponents/NewItemForm.vue
+++ b/src/components/CommunityComponents/NewItemForm.vue
@@ -22,11 +22,11 @@
<!-- error message for title-->
<div
- class="text-red"
+ class="text-error"
v-for="(error, index) of v$.item.title.$errors"
:key="index"
>
- <div class="text-red-600 text-sm">
+ <div class="text-error text-sm">
{{ error.$message }}
</div>
</div>
@@ -58,11 +58,11 @@
<!-- error message for select box -->
<div
- class="text-red"
+ class="text-error"
v-for="(error, index) of v$.item.select.$errors"
:key="index"
>
- <div class="text-red-600 text-sm">
+ <div class="text-error text-sm">
{{ error.$message }}
</div>
</div>
@@ -92,11 +92,11 @@
<!-- error message for select box -->
<div
- class="text-red"
+ class="text-error"
v-for="(error, index) of v$.item.selectGroup.$errors"
:key="index"
>
- <div class="text-red-600 text-sm">
+ <div class="text-error text-sm">
{{ error.$message }}
</div>
</div>
@@ -119,11 +119,11 @@
<!-- error message for price -->
<div
- class="text-red"
+ class="text-error"
v-for="(error, index) of v$.item.price.$errors"
:key="index"
>
- <div class="text-red-600 text-sm">
+ <div class="text-error text-sm">
{{ error.$message }}
</div>
</div>
@@ -146,11 +146,11 @@
<!-- error message for description -->
<div
- class="text-red"
+ class="text-error"
v-for="(error, index) of v$.item.description.$errors"
:key="index"
>
- <div class="text-red-600 text-sm">
+ <div class="text-error text-sm">
{{ error.$message }}
</div>
</div>
@@ -172,11 +172,11 @@
<!-- error message for address-->
<div
- class="text-red"
+ class="text-error"
v-for="(error, index) of v$.item.address.$errors"
:key="index"
>
- <div class="text-red-600 text-sm">
+ <div class="text-error text-sm">
{{ error.$message }}
</div>
</div>
diff --git a/src/components/CommunityComponents/SearchItemList.vue b/src/components/CommunityComponents/SearchItemList.vue
index 51f51ac..32d806a 100644
--- a/src/components/CommunityComponents/SearchItemList.vue
+++ b/src/components/CommunityComponents/SearchItemList.vue
@@ -16,7 +16,7 @@
<input
type="text"
id="searchInput"
- class="w-full py-3 pl-10 pr-4 text-gray-700 bg-white border rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-600 focus:border-blue-500 dark:focus:border-blue-500 focus:outline-none focus:ring"
+ class="w-full py-3 pl-10 pr-4 text-gray-700 bg-white border rounded-md dark:bg-gray-800 dark:text-gray-300 dark:border-gray-600 focus:border-primary-medium dark:focus:border-primary-medium focus:outline-none focus:ring"
placeholder="Search"
v-model="search"
/>
diff --git a/src/components/UserProfileComponents/LargeProfileCard.vue b/src/components/UserProfileComponents/LargeProfileCard.vue
index 19d2596..7c558f7 100644
--- a/src/components/UserProfileComponents/LargeProfileCard.vue
+++ b/src/components/UserProfileComponents/LargeProfileCard.vue
@@ -67,7 +67,7 @@
<li>
<router-link
to=""
- class="block py-2 px-4 text-sm text-red-600 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white"
+ class="block py-2 px-4 text-sm text-error hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white"
>Slett bruker</router-link
>
</li>
diff --git a/src/components/UserProfileComponents/Rating.vue b/src/components/UserProfileComponents/Rating.vue
index c6e7e82..8aff6ba 100644
--- a/src/components/UserProfileComponents/Rating.vue
+++ b/src/components/UserProfileComponents/Rating.vue
@@ -47,7 +47,7 @@ export default {
methods: {
getFill(i) {
if (i <= this.rating) {
- return "w-5 h-5 text-yellow-400";
+ return "w-5 h-5 text-warn";
}
return "w-5 h-5 text-gray-300 dark:text-gray-500";
},
--
GitLab