From aaaa7c7a0573ee8b1f84844275ee0ba703c9e420 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Mon, 12 Mar 2018 16:36:26 +0000 Subject: [PATCH] Converted category select into buttons, no color yet --- package-lock.json | 6 +++--- package.json | 2 +- src/app/dashboard/add-data.component.html | 25 ++++++++++------------- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index ecdbe1a..7334a98 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6752,9 +6752,9 @@ "integrity": "sha1-zJJ7GR2Yb+D7atKVeQdQxV3L6FE=" }, "ngx-bootstrap": { - "version": "2.0.0-beta.8", - "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-2.0.0-beta.8.tgz", - "integrity": "sha512-e+3euXDb4nhzxn9kBO4RPWwRaI2ef7Lg+us8Yo2DBfD/Kuk/vl7ksWjoolMFLKEGpcTcKhMT/4BH5dUx+S4AtA==" + "version": "2.0.0-rc.1", + "resolved": "https://registry.npmjs.org/ngx-bootstrap/-/ngx-bootstrap-2.0.0-rc.1.tgz", + "integrity": "sha512-/ARJ2LLrT4bDghOVS16btJovJ7lsDcILmBUvGt0EXzNlU1HbTQZKfl/OKhrufmRgHQIzc6kXckVUhz5d5QIsUA==" }, "ngx-pagination": { "version": "3.0.3", diff --git a/package.json b/package.json index 11dcb5e..5d7e254 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "moment": "^2.21.0", "ng2-charts": "1.6.0", "ng2-validation-manager": "0.5.3", - "ngx-bootstrap": "2.0.0-beta.8", + "ngx-bootstrap": "2.0.0-rc.1", "ngx-pagination": "3.0.3", "rxjs": "5.5.6", "ts-helpers": "1.1.2", diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html index a756040..d832253 100644 --- a/src/app/dashboard/add-data.component.html +++ b/src/app/dashboard/add-data.component.html @@ -78,21 +78,18 @@
-
-
- - -
-
- - -
+
+ +
-
-
- - -
+
+
Optional: Choose the Budget Type for the majority of the purchase.