diff --git a/src/components/SavingsPath.vue b/src/components/SavingsPath.vue index 2d08ec49dba0b26345443da9a143cac65e213997..6c35db6c8c012a0e797b104b3f81fe0adae2f9d9 100644 --- a/src/components/SavingsPath.vue +++ b/src/components/SavingsPath.vue @@ -41,7 +41,7 @@ 'justify-center mx-auto md:justify-between': index % 2 === 1, 'justify-center md:justify-between mx-auto': index % 2 === 0 }" - class="flex flex-row w-full md:w-4/5 justify-start gap-4 md:gap-8" + class="flex flex-row w-full md:w-4/5 justify-start gap-4 md:gap-8 h-auto" > <div class="flex"> <img-gif-template @@ -97,14 +97,14 @@ v-if="index === challengesLocal.length - 1 && index % 2 === 0" class="flex flex-row mt-2" > - <button class="text-2xl ml-48" @click="addSpareUtfordring">+</button> + <button class="text-2xl ml-48 mr-2 primary" @click="addSpareUtfordring">+</button> <p class="">Legg til <br />Spareutfordring</p> </div> <div v-else-if="index === challengesLocal.length - 1 && index % 2 !== 0" class="mr-20 flex flex-row" > - <button class="text-2xl ml-10 rounded-full" @click="addSpareUtfordring"> + <button class="text-2xl ml-10 rounded-full primary" @click="addSpareUtfordring"> + </button> <p class="pl-2">Legg til <br />Spareutfordring</p> diff --git a/src/views/ManageChallengeView.vue b/src/views/ManageChallengeView.vue index 1ffb805481b4f1d7f3c8b5bddcc4b0a7269e0b15..72b45935a459388a3717bb639c3920ddf255bffe 100644 --- a/src/views/ManageChallengeView.vue +++ b/src/views/ManageChallengeView.vue @@ -237,21 +237,18 @@ const removeUploadedFile = () => { <p class="mx-4">Forfallsdato*</p> <input :min="minDate" - :max="maxDate" v-model="selectedDate" placeholder="Forfallsdato" type="date" /> </div> - </div> - <div class="flex flex-row justify-between w-full"> <div class="flex flex-col items-center"> <p>Last opp ikon for utfordringen📸</p> <label for="fileUpload" - class="bg-white text-black text-lg p-1 mt-2 rounded cursor-pointer leading-none" + class="bg-white text-black text-lg cursor-pointer leading-none rounded-full border p-3 border-black" > - 💾 + Legg til 💾 </label> <input id="fileUpload" @@ -271,6 +268,7 @@ const removeUploadedFile = () => { </div> </div> </div> + <div class="flex flex-row justify-between w-full"> <button class="primary danger" @click="cancelCreation" v-text="'Avbryt'" /> diff --git a/src/views/ManageConfigView.vue b/src/views/ManageConfigView.vue index 508c96af766ff32f88271afd59d372f423b502d2..2a5ad08eaf1f68ff0d5e299965567082fb8c635e 100644 --- a/src/views/ManageConfigView.vue +++ b/src/views/ManageConfigView.vue @@ -168,7 +168,7 @@ onMounted(() => { <button class="primary danger w-min items-center" @click="deleteChallengeType(item.type)" - v-text="'x'" + v-text="'Slett'" /> </CardTemplate> <button diff --git a/src/views/ManageGoalView.vue b/src/views/ManageGoalView.vue index c9e0d688752695d63e3338237215dd5329e311a8..78415a96f31adb569ee3734542125a326504d901 100644 --- a/src/views/ManageGoalView.vue +++ b/src/views/ManageGoalView.vue @@ -269,9 +269,9 @@ onMounted(async () => { <p>Last opp ikon for utfordringen📸</p> <label for="fileUpload" - class="bg-white text-black text-lg p-1 mt-2 rounded cursor-pointer leading-none" + class="bg-white text-black text-lg cursor-pointer leading-none rounded-full border p-3 border-black" > - 💾 + Legg til 💾 </label> <input id="fileUpload" diff --git a/src/views/ViewProfileView.vue b/src/views/ViewProfileView.vue index 74d17a78f8d7eddb808fc2345a31df249ac94161..86647f4720092860ade5c8cd7c5dcb8a1fec9197 100644 --- a/src/views/ViewProfileView.vue +++ b/src/views/ViewProfileView.vue @@ -69,11 +69,11 @@ const openSpare = () => { <div class="flex flex-row gap-5"> <div class="w-32 h-32 border-slate-200 border-2 rounded-full shrink-0" /> <div class="w-full flex flex-col justify-between"> - <h3 class="font-thin my-0">{{ profile?.username }}</h3> - <h3 class="font-thin my-0"> + <h3 class="font-thin my-0 md:text-xl text-lg">{{ profile?.username }}</h3> + <h3 class="font-thin my-0 md:text-xl text-lg"> {{ profile?.firstName + ' ' + profile?.lastName }} </h3> - <h3 class="font-thin my-0">{{ profile?.email }}</h3> + <h3 class="font-thin my-0 md:text-xl text-lg">{{ profile?.email }}</h3> </div> </div>