Skip to content
Snippets Groups Projects
Commit 44373427 authored by Ina Martini's avatar Ina Martini
Browse files

Merge branch 'enhancement/9/update-styling-on-application' into 'dev'

Update styling on application

See merge request !23
parents 3e5737b6 687b9c29
No related branches found
No related tags found
3 merge requests!66Final merge,!23Update styling on application,!4Pipeline fix
Pipeline #278380 passed
...@@ -75,12 +75,15 @@ watch( ...@@ -75,12 +75,15 @@ watch(
class="w-full" class="w-full"
placeholder="Skriv inn passord" placeholder="Skriv inn passord"
/> />
<button class="absolute right-0 top-1 bg-transparent" @click="toggleShowPassword"> <button
class="absolute right-0 top-1 bg-transparent hover:bg-transparent"
@click="toggleShowPassword"
>
{{ showPassword ? '🔓' : '🔒' }} {{ showPassword ? '🔓' : '🔒' }}
</button> </button>
<a <a
@click="openForgotPasswordModal" @click="openForgotPasswordModal"
class="absolute right-3 top-10 hover:underline hover:bg-transparent cursor-pointer" class="transition-none absolute right-3 top-10 hover:underline hover:bg-transparent text-[#ef9691] hover:transition-none hover:p-0 cursor-pointer"
>Glemt passord?</a >Glemt passord?</a
> >
</div> </div>
...@@ -115,13 +118,13 @@ watch( ...@@ -115,13 +118,13 @@ watch(
<button <button
:disabled="!isEmailValid" :disabled="!isEmailValid"
@click="submitReset" @click="submitReset"
class="active-button font-bold py-2 px-4 w-1/2 hover:bg-[#f7da7c] border-2 border-[#f7da7c] disabled:border-transparent" class="active-button font-bold py-2 px-4 w-1/2 border-2 disabled:border-transparent"
> >
Send mail Send mail
</button> </button>
<button <button
@click="closeModal" @click="closeModal"
class="active-button font-bold py-2 px-4 w-1/2 hover:bg-[#f7da7c] border-2 border-[#f7da7c] disabled:border-transparent" class="active-button font-bold py-2 px-4 w-1/2 border-2 disabled:border-transparent"
> >
Lukk Lukk
</button> </button>
......
...@@ -130,7 +130,10 @@ watch( ...@@ -130,7 +130,10 @@ watch(
class="w-full" class="w-full"
:class="{ 'bg-green-200': isPasswordValid }" :class="{ 'bg-green-200': isPasswordValid }"
/> />
<button class="absolute right-0 top-1 bg-transparent" @click="toggleShowPassword"> <button
class="absolute right-0 top-1 bg-transparent hover:bg-transparent"
@click="toggleShowPassword"
>
{{ showPassword ? '🔓' : '🔒' }} {{ showPassword ? '🔓' : '🔒' }}
</button> </button>
</div> </div>
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
:class="{ 'bg-green-200': isPasswordValid }" :class="{ 'bg-green-200': isPasswordValid }"
/> />
<button <button
class="absolute right-0 top-1 bg-transparent" class="absolute right-0 top-1 bg-transparent hover:bg-transparent"
@click="toggleShowPassword" @click="toggleShowPassword"
> >
{{ showPassword ? '🔓' : '🔒' }} {{ showPassword ? '🔓' : '🔒' }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment