Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
idatt2106_2024_02_frontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
IDATT2106 - Gruppe 2
idatt2106_2024_02_frontend
Commits
bf2728cd
Commit
bf2728cd
authored
11 months ago
by
Eline Evje
Browse files
Options
Downloads
Patches
Plain Diff
fix: fixed position of buttons
parent
d7c0f908
No related branches found
No related tags found
3 merge requests
!66
Final merge
,
!14
Enhancement/implement more config steps
,
!4
Pipeline fix
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/views/FirstSavingChallengeView.vue
+17
-16
17 additions, 16 deletions
src/views/FirstSavingChallengeView.vue
src/views/FirstSavingGoalView.vue
+5
-4
5 additions, 4 deletions
src/views/FirstSavingGoalView.vue
with
22 additions
and
20 deletions
src/views/FirstSavingChallengeView.vue
+
17
−
16
View file @
bf2728cd
<
template
>
<div
class=
"flex flex-col items-center justify-
center
min-h-screen px-4 text-center"
>
<div
class=
"flex flex-col items-center justify-
start
min-h-screen px-4 text-center"
>
<div
class=
"mb-20"
>
<div
class=
"flex flex-col items-center justify-
center
bg-white shadow-md rounded-lg p-16"
style=
"height: 5
0
0px; min-height: 500px; min-width: 400px; max-width: 400px"
class=
"flex flex-col items-center justify-
start
bg-white shadow-md rounded-lg p-16"
style=
"height: 5
3
0px; min-height: 500px; min-width: 400px; max-width: 400px"
>
<template
v-if=
"!skipped && !accepted"
>
<div
class=
"mb-6 w-full text-left"
>
...
...
@@ -26,30 +26,31 @@
{{
buttonText
}}
</button>
</div>
<div
class=
"flex justify-between w-full mt-
auto
space-x-2"
>
<div
class=
"flex justify-between w-full mt-
4
space-x-2"
>
<button
class=
"
bg-[var(--green)]
border
4
border
-[var(--green)] hover:brightness-90 active:brightness-75
font-bold rounded-lg py-2 px-10 text-lg
"
class=
"border
-
4
font-bold rounded-lg py-2 px-10 text-lg transition-all bg
-[var(--green)] hover:brightness-90 active:brightness-75"
@
click=
"skip"
style=
"margin-top: 29px;"
>
Skip
</button>
<button
:class=
"[
'border-4 font-bold rounded-lg py-2 px-10 text-lg transition-all',
{
'bg-[var(--green)] hover:brightness-90 active:brightness-75':
selectedOptions.length > 0
},
{
'opacity-60 bg-[rgba(149,227,93,0.6)] cursor-not-allowed':
selectedOptions.length === 0
}
]"
'border-4 font-bold rounded-lg py-2 px-10 text-lg transition-all',
{
'bg-[var(--green)] hover:brightness-90 active:brightness-75': selectedOptions.length > 0
},
{
'opacity-60 bg-[rgba(149,227,93,0.6)] cursor-not-allowed': selectedOptions.length === 0
}
]"
:disabled="selectedOptions.length === 0"
@click="accept"
style="margin-top: 29px;"
>
Godta
</button>
</div>
</
template
>
<
template
v-else
>
...
...
@@ -62,7 +63,7 @@
<ContinueButtonComponent
:disabled=
"!skipped && !accepted"
@
click=
"onButtonClick"
class=
"px-10 py-3 text-2xl font-bold self-end mb-32 mt-[-1
1
px]"
class=
"px-10 py-3 text-2xl font-bold self-end mb-32 mt-[-1
0
px]"
></ContinueButtonComponent>
</div>
</template>
...
...
This diff is collapsed.
Click to expand it.
src/views/FirstSavingGoalView.vue
+
5
−
4
View file @
bf2728cd
...
...
@@ -2,12 +2,13 @@
<div
class=
"flex flex-col items-center justify-start min-h-screen px-4 text-center"
>
<div
class=
"mb-20"
>
<div
class=
"flex flex-col items-center justify-start bg-white shadow-md rounded-lg p-16 min-h-[500px] min-w-[400px] max-w-[400px]"
class=
"flex flex-col items-center justify-center bg-white shadow-md rounded-lg p-16"
style=
"height: 530px; min-height: 500px; min-width: 400px; max-width: 400px"
>
<template
v-if=
"!skipped && !accepted"
>
<div
class=
"mb-6 w-full text-left"
>
<label
for=
"savings-goal"
class=
"block text-xl font-bold mb-2"
>
Jeg vil spare til:
</label
>
Jeg vil spare til:
</label
>
<input
type=
"text"
...
...
@@ -23,7 +24,7 @@
</div>
<div
class=
"mb-8 w-full flex items-center"
>
<label
for=
"amount"
class=
"shrink-0 text-xl font-bold mr-2"
>
Jeg vil spare:
</label
>
Jeg vil spare:
</label
>
<input
type=
"text"
...
...
@@ -75,7 +76,7 @@
<ContinueButtonComponent
:disabled=
"!skipped && !accepted"
@
click=
"onButtonClick"
class=
"px-10 py-3 text-
2x
l font-bold self-end mb-80 mt-[-
7
px]"
class=
"px-10 py-3 text-l
g
font-bold self-end mb-80 mt-[-
10
px]"
></ContinueButtonComponent>
</div>
</template>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment