Skip to content
Snippets Groups Projects
Commit 57e18cb8 authored by Madeleine Stenberg Jonassen's avatar Madeleine Stenberg Jonassen
Browse files

Merge branch 'final-ui-change' into 'main'

Change show password icon back to OG state

See merge request !53
parents ba12ff1b bc384eb4
No related tags found
1 merge request!53Change show password icon back to OG state
Pipeline #270183 passed
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</div> <br> </div> <br>
<label class="error-message">{{errorMsg}}</label><br> <label class="error-message">{{errorMsg}}</label><br>
<p> Don't have a account?</p><router-link to="/signup" id="signUpLink">SIGNUP!</router-link> <p> Don't have an account?</p><router-link to="/signup" id="signUpLink">SIGNUP!</router-link>
</div> </div>
</div> </div>
...@@ -99,15 +99,20 @@ export default { ...@@ -99,15 +99,20 @@ export default {
display: inline-block; display: inline-block;
min-width: 300px; min-width: 300px;
} }
.password-input input {
padding-right: 40px;
}
.showPasswordIcon { .showPasswordIcon {
position: absolute; position: absolute;
top: 50%;
right: 10px; right: 10px;
transform: translateY(-50%); transform: translateY(-50%);
border: none; border: none;
background: none; background: none;
cursor: pointer; cursor: pointer;
} }
#signUpLink { #signUpLink {
color: var(--option-color); color: var(--option-color);
padding: 10px; padding: 10px;
......
...@@ -155,8 +155,8 @@ export default { ...@@ -155,8 +155,8 @@ export default {
<div v-if="showPopup" class="popup"> <div v-if="showPopup" class="popup">
<p>{{ popupMessage }}</p> <p>{{ popupMessage }}</p>
</div> </div>
<button v-if="hasAnswered" @click="nextQuestion">{{buttonText}}</button> <button class="play-quiz-btn" v-if="hasAnswered" @click="nextQuestion">{{buttonText}}</button>
<button v-if="!hasAnswered" @click="submitAnswer">Submit</button> <button class="play-quiz-btn" v-if="!hasAnswered" @click="submitAnswer">Submit</button>
</div> </div>
</div> </div>
</body> </body>
...@@ -230,7 +230,7 @@ h1#title { ...@@ -230,7 +230,7 @@ h1#title {
} }
button { .play-quiz-btn {
background-color: var(--option-color); background-color: var(--option-color);
color: var(--text-light-color); color: var(--text-light-color);
font-size: 18px; font-size: 18px;
...@@ -242,7 +242,7 @@ button { ...@@ -242,7 +242,7 @@ button {
transition: background-color 0.3s ease; transition: background-color 0.3s ease;
} }
button:hover { .play-quiz-btn:hover {
background-color: var(--option-hover); background-color: var(--option-hover);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment