From bca0e740ef9801cdeba6be21189679b4d996b5f5 Mon Sep 17 00:00:00 2001 From: Ben Goldsworthy Date: Sat, 17 Oct 2020 18:39:59 +0100 Subject: [PATCH 1/5] Fix cosmetic issues --- src/app/dashboard/add-data.component.html | 8 ++++---- src/app/dashboard/feedback.component.html | 2 +- .../dashboard/more-graphs-and-tables.component.html | 2 +- src/app/dashboard/suppliers.component.html | 4 ++-- src/scss/bootstrap/_button-group.scss | 1 + src/scss/bootstrap/_buttons.scss | 10 ++++++---- src/scss/bootstrap/_card.scss | 4 ++++ src/scss/bootstrap/_input-group.scss | 10 ++++++++++ src/scss/bootstrap/_tables.scss | 2 ++ 9 files changed, 31 insertions(+), 12 deletions(-) diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html index 8f73ecc..9b85ce3 100644 --- a/src/app/dashboard/add-data.component.html +++ b/src/app/dashboard/add-data.component.html @@ -1,6 +1,6 @@
-
+
Submit Transaction @@ -21,7 +21,7 @@
- Enter the amount spent, such as 5.35 for £5.35. + Enter the amount spent, such as ‘5.35’ for £5.35.
@@ -29,7 +29,7 @@
- + Tick if the purchase is deemed an essential purchase for budgeting purposes.
@@ -38,7 +38,7 @@
- + Tick if the purchase frequently recurs, such as monthly.
diff --git a/src/app/dashboard/feedback.component.html b/src/app/dashboard/feedback.component.html index dd844e6..7b4e216 100644 --- a/src/app/dashboard/feedback.component.html +++ b/src/app/dashboard/feedback.component.html @@ -1,6 +1,6 @@
-
+
Submit Transaction diff --git a/src/app/dashboard/more-graphs-and-tables.component.html b/src/app/dashboard/more-graphs-and-tables.component.html index 73cef98..307f1a6 100644 --- a/src/app/dashboard/more-graphs-and-tables.component.html +++ b/src/app/dashboard/more-graphs-and-tables.component.html @@ -27,7 +27,7 @@ - + diff --git a/src/app/dashboard/suppliers.component.html b/src/app/dashboard/suppliers.component.html index 6543598..20c0bf4 100644 --- a/src/app/dashboard/suppliers.component.html +++ b/src/app/dashboard/suppliers.component.html @@ -1,6 +1,6 @@
-
+

Search Suppliers

@@ -20,7 +20,7 @@
-
+

List of Suppliers

diff --git a/src/scss/bootstrap/_button-group.scss b/src/scss/bootstrap/_button-group.scss index d4c79ab..644f2be 100644 --- a/src/scss/bootstrap/_button-group.scss +++ b/src/scss/bootstrap/_button-group.scss @@ -11,6 +11,7 @@ position: relative; flex: 0 1 auto; margin-bottom: 0; + cursor: pointer; // Bring the hover, focused, and "active" buttons to the fron to overlay // the borders properly diff --git a/src/scss/bootstrap/_buttons.scss b/src/scss/bootstrap/_buttons.scss index 05c54e4..42daffe 100644 --- a/src/scss/bootstrap/_buttons.scss +++ b/src/scss/bootstrap/_buttons.scss @@ -32,10 +32,12 @@ @include box-shadow(none); } - &:active, - &.active { - background-image: none; - @include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow); + :enabled { + &:active, + &.active { + background-image: none; + @include box-shadow($btn-focus-box-shadow, $btn-active-box-shadow); + } } } diff --git a/src/scss/bootstrap/_card.scss b/src/scss/bootstrap/_card.scss index 7be2aaf..5f2d2f8 100644 --- a/src/scss/bootstrap/_card.scss +++ b/src/scss/bootstrap/_card.scss @@ -70,6 +70,10 @@ &:first-child { @include border-radius($card-border-radius-inner $card-border-radius-inner 0 0); } + + small { + padding-left: 1em; + } } .card-footer { diff --git a/src/scss/bootstrap/_input-group.scss b/src/scss/bootstrap/_input-group.scss index 0b668bf..f238f70 100644 --- a/src/scss/bootstrap/_input-group.scss +++ b/src/scss/bootstrap/_input-group.scss @@ -23,6 +23,16 @@ z-index: 3; } } + + input[type="radio"], + input[type="checkbox"] { + cursor: pointer; + } +} + +.help-block { + font-size: 0.8em; + font-style: italic; } .input-group-addon, diff --git a/src/scss/bootstrap/_tables.scss b/src/scss/bootstrap/_tables.scss index 36c3dab..9814f23 100644 --- a/src/scss/bootstrap/_tables.scss +++ b/src/scss/bootstrap/_tables.scss @@ -80,6 +80,8 @@ .table-hover { tbody tr { + cursor: pointer; + @include hover { background-color: $table-bg-hover; } From 5ea99fb5196cf6f264c8101675f3935d4d1fe119 Mon Sep 17 00:00:00 2001 From: Ben Goldsworthy Date: Sat, 17 Oct 2020 18:52:03 +0100 Subject: [PATCH 2/5] Rename 'add/submit transaction' --- src/app/dashboard/add-data.component.html | 10 ++++++++-- src/app/dashboard/dashboard.routing.ts | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html index 9b85ce3..3a64384 100644 --- a/src/app/dashboard/add-data.component.html +++ b/src/app/dashboard/add-data.component.html @@ -3,14 +3,20 @@
- Submit Transaction + Record Transaction Required Data marked in bold.
- + Enter the date and time the transaction occurred.
diff --git a/src/app/dashboard/dashboard.routing.ts b/src/app/dashboard/dashboard.routing.ts index 6d554ef..4a622da 100644 --- a/src/app/dashboard/dashboard.routing.ts +++ b/src/app/dashboard/dashboard.routing.ts @@ -48,7 +48,7 @@ const routes: Routes = [ { path: 'add-data', component: AddDataComponent, - data: { title: 'Add Transaction' }, + data: { title: 'Record Transaction' }, }, { path: 'leaderboard', From 09b15e142ba4a3928299e9b97b6137d235a0d723 Mon Sep 17 00:00:00 2001 From: Ben Goldsworthy Date: Sat, 17 Oct 2020 18:54:44 +0100 Subject: [PATCH 3/5] Rename and move 'submit feedback' --- src/app/dashboard/dashboard.routing.ts | 2 +- src/app/dashboard/feedback.component.html | 2 +- src/app/layouts/full-layout.component.html | 21 ++++++++++++--------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/app/dashboard/dashboard.routing.ts b/src/app/dashboard/dashboard.routing.ts index 4a622da..9a8d5fe 100644 --- a/src/app/dashboard/dashboard.routing.ts +++ b/src/app/dashboard/dashboard.routing.ts @@ -85,7 +85,7 @@ const routes: Routes = [ { path: 'feedback', component: FeedbackComponent, - data: { title: 'Give Feedback' }, + data: { title: 'Submit Feedback' }, }, { path: 'suppliers', diff --git a/src/app/dashboard/feedback.component.html b/src/app/dashboard/feedback.component.html index 7b4e216..431a548 100644 --- a/src/app/dashboard/feedback.component.html +++ b/src/app/dashboard/feedback.component.html @@ -3,7 +3,7 @@
- Submit Transaction + Submit Feedback Required Data marked in bold.
diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 31e297a..64bd56d 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -50,15 +50,7 @@
-
Add Transaction
-
- - -
  • - -
    -
    -
    Enter Feedback
    +
    Record Transaction
    • @@ -119,6 +111,17 @@ +
    +
    From 539f175e2b2d79d79505f40cf62436caf6a3584c Mon Sep 17 00:00:00 2001 From: Ben Goldsworthy Date: Sat, 17 Oct 2020 19:01:03 +0100 Subject: [PATCH 4/5] Rearrange sidebar links, add titles --- src/app/layouts/full-layout.component.html | 47 +++++++++++++--------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index 64bd56d..aeee9ab 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -38,14 +38,12 @@
    -
  • - -
    -
    -
    Infographics
    -
    -     -
    • + + +
    + + + +
    + + -
    -
    From 04a3d145dfa43ac46caebc0c87c89c395c07b4cf Mon Sep 17 00:00:00 2001 From: Ben Goldsworthy Date: Sat, 17 Oct 2020 19:02:50 +0100 Subject: [PATCH 5/5] Update copyright declaration --- src/app/layouts/full-layout.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/layouts/full-layout.component.html b/src/app/layouts/full-layout.component.html index aeee9ab..4e0f26b 100644 --- a/src/app/layouts/full-layout.component.html +++ b/src/app/layouts/full-layout.component.html @@ -151,6 +151,6 @@
    WardType Amount of Transactions Sum of Transactions