diff --git a/frontend/allowance-planner-v2/src/app/pages/add-allowance/add-allowance.page.scss b/frontend/allowance-planner-v2/src/app/pages/add-allowance/add-allowance.page.scss index b819a5f..50e2f84 100644 --- a/frontend/allowance-planner-v2/src/app/pages/add-allowance/add-allowance.page.scss +++ b/frontend/allowance-planner-v2/src/app/pages/add-allowance/add-allowance.page.scss @@ -30,8 +30,7 @@ button { color: white; padding: 10px; width: 250px; - margin-top: auto; - margin-bottom: 50px; + margin-top: 100px; } button:disabled, diff --git a/frontend/allowance-planner-v2/src/app/pages/edit-allowance/edit-allowance.page.html b/frontend/allowance-planner-v2/src/app/pages/edit-allowance/edit-allowance.page.html index e615ac8..f17c6b8 100644 --- a/frontend/allowance-planner-v2/src/app/pages/edit-allowance/edit-allowance.page.html +++ b/frontend/allowance-planner-v2/src/app/pages/edit-allowance/edit-allowance.page.html @@ -7,11 +7,6 @@ Create Goal Edit Goal Edit Allowance - @@ -43,5 +38,10 @@ Update Goal Update Allowance + diff --git a/frontend/allowance-planner-v2/src/app/pages/edit-allowance/edit-allowance.page.scss b/frontend/allowance-planner-v2/src/app/pages/edit-allowance/edit-allowance.page.scss index d0d5f34..78327f8 100644 --- a/frontend/allowance-planner-v2/src/app/pages/edit-allowance/edit-allowance.page.scss +++ b/frontend/allowance-planner-v2/src/app/pages/edit-allowance/edit-allowance.page.scss @@ -4,10 +4,8 @@ } .remove-button { - background-color: var(--ion-color-primary); - margin-right: 15px; - width: 100px; - margin-bottom: 0; + margin-top: 10px; + background-color: var(--negative-amount-color); } form { @@ -47,8 +45,7 @@ button { color: white; padding: 10px; width: 250px; - margin-top: auto; - margin-bottom: 50px; + margin-top: 100px; } button:disabled, diff --git a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.html b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.html index 54b2a15..9c7cc1d 100644 --- a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.html +++ b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.html @@ -6,11 +6,6 @@ Create Task Edit Task - @@ -32,5 +27,10 @@ Add Task Update Task + diff --git a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.scss b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.scss index 41248d2..9e3f6ce 100644 --- a/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.scss +++ b/frontend/allowance-planner-v2/src/app/pages/edit-task/edit-task.page.scss @@ -4,10 +4,8 @@ } .remove-button { - background-color: var(--ion-color-primary); - margin-right: 15px; - width: 95px; - margin-bottom: 0; + margin-top: 10px; + background-color: var(--negative-amount-color); } form { @@ -36,8 +34,7 @@ button { color: white; padding: 10px; width: 250px; - margin-top: auto; - margin-bottom: 50px; + margin-top: 100px; } button:disabled, diff --git a/frontend/allowance-planner-v2/src/app/pages/history/history.page.scss b/frontend/allowance-planner-v2/src/app/pages/history/history.page.scss index e0c79ea..c34e68c 100644 --- a/frontend/allowance-planner-v2/src/app/pages/history/history.page.scss +++ b/frontend/allowance-planner-v2/src/app/pages/history/history.page.scss @@ -8,6 +8,7 @@ .left { width: 70%; + font-size: 18px; } .date { diff --git a/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.html b/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.html index beac10a..03d1920 100644 --- a/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.html +++ b/frontend/allowance-planner-v2/src/app/pages/tasks/tasks.page.html @@ -18,8 +18,12 @@
-
{{ task.name }}
-
{{ usernames[task.assigned ? task.assigned : 0] }}
+
+
+ {{ task.name }} + {{ usernames[task.assigned ? task.assigned : 0] }} +
+