From 71eee8f06b5e4b2500b776a7f9dcd2cf9992dbbf Mon Sep 17 00:00:00 2001 From: piratefinn Date: Thu, 21 Dec 2017 17:20:56 +0000 Subject: [PATCH 1/2] updated pie css --- .../dashboard-customer.component.html | 2 +- src/app/panels/pie-panel.component.html | 2 +- .../snippets/cust-snippet-bar.component.html | 52 +++++++++++++------ src/scss/_custom.scss | 7 ++- 4 files changed, 43 insertions(+), 20 deletions(-) diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html index ab19c9b..46310d0 100644 --- a/src/app/dashboard/dashboard-customer.component.html +++ b/src/app/dashboard/dashboard-customer.component.html @@ -78,7 +78,7 @@
-

Sector Purchase Amounts

+

Purchases by Sector

diff --git a/src/app/panels/pie-panel.component.html b/src/app/panels/pie-panel.component.html index eb0c194..7e2dd4a 100644 --- a/src/app/panels/pie-panel.component.html +++ b/src/app/panels/pie-panel.component.html @@ -2,7 +2,7 @@
-

Local Purchases

+

All Purchases

+
+
+
+
  • -
    My Rank
    +
    My Rank
    Unranked
    @@ -18,20 +24,32 @@
    {{ userPosition }}
-
-
+ +
+
+
+
+
+
+
  • -
    My Total Spend
    +
    My Total Spend
    {{ userSum | currency:'GBP':'symbol':'1.2-2' }}
  • -
-
+ +
+
+
+
+
+
+
  • -
    Value to Local Economy
    +
    Value to Local Economy
    {{ userSum * 2.3 | currency:'GBP':'symbol':'1.2-2' }}
  • -
+
- +
diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index 9efb502..fa409c6 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -34,10 +34,15 @@ agm-map { padding: 5rem 5%; line-height: 0; position: relative; - background: #20a8d8; + background: #4dbd74; color: white; font-size: 0.875rem; } + +.text-dark-green { + color: #10602c; +} + // white title font variant on type-2 as defined in _widgets.css .horizontal-bars { padding: 0; From c7020f4283f5bd5b3196fe6d53d6504db0c65dbe Mon Sep 17 00:00:00 2001 From: piratefinn Date: Thu, 21 Dec 2017 17:27:14 +0000 Subject: [PATCH 2/2] changelog and versioning updated --- CHANGELOG.md | 5 +++++ package-lock.json | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fb614e..7923872 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ # Next Release +# v0.1.1 + +* Redid layout on circle customer view +* Renamed customer dashboard headers + # v0.1.0 * Changed Story Trail choosing to modals diff --git a/package-lock.json b/package-lock.json index 4438a01..2e529ad 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "localloop-web", - "version": "0.1.0", + "version": "0.1.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index b2811a6..6b3ee33 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "localloop-web", - "version": "0.1.0", + "version": "0.1.1", "description": "LocalLoop Web - Web interface for LocalLoop app", "author": "", "url": "http://www.peartrade.org",