diff --git a/package-lock.json b/package-lock.json index 5819453f..5279f641 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "fuse2", - "version": "1.1.2", + "version": "1.2.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -272,14 +272,6 @@ "resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-10.4.0.tgz", "integrity": "sha512-wTV/64vEGPFlcpE+ezTN18baOsNXyfLLvdmhEoaDQt2OJtTKtNxJkze24w71utoJxutQRrfHJUVSkAF4CLNckA==" }, - "@swimlane/ngx-dnd": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@swimlane/ngx-dnd/-/ngx-dnd-3.0.0.tgz", - "integrity": "sha512-LH/Nc6/2tyX7U9SHa5hNvC2Sk/svj/PMrJu34V/BF/H811fik5AGzTjORdGQo7cl2m951MEkl9yijMKywRw37w==", - "requires": { - "dragula": "3.7.2" - } - }, "@types/jasmine": { "version": "2.5.54", "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.5.54.tgz", @@ -313,6 +305,14 @@ "integrity": "sha1-dMt3+2BS7a/yqJhN2v2I1BnyXKw=", "dev": true }, + "@withinpixels/ngx-dnd": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@withinpixels/ngx-dnd/-/ngx-dnd-3.1.0.tgz", + "integrity": "sha512-xdKp0T/JuETNVRWgRxbcx+pD6THX8OBw50wpsfi7AeK/wmvXEI1U28quh1a30T298QA7i5sofbTByUGm/XIfLg==", + "requires": { + "dragula": "3.7.2" + } + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", diff --git a/package.json b/package.json index 3d2ac965..a9374284 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fuse2", - "version": "1.1.2", + "version": "1.2.0", "license": "", "scripts": { "ng": "ng", @@ -31,7 +31,7 @@ "@ngx-translate/core": "8.0.0", "@swimlane/ngx-charts": "6.1.0", "@swimlane/ngx-datatable": "10.4.0", - "@swimlane/ngx-dnd": "3.0.0", + "@withinpixels/ngx-dnd": "3.1.0", "angular-calendar": "0.21.3", "angular-in-memory-web-api": "0.5.1", "angular2-markdown": "1.6.0", diff --git a/src/app/core/modules/shared.module.ts b/src/app/core/modules/shared.module.ts index bec7938c..bc7edd29 100644 --- a/src/app/core/modules/shared.module.ts +++ b/src/app/core/modules/shared.module.ts @@ -5,7 +5,7 @@ import { CommonModule } from '@angular/common'; import { MaterialModule } from './material.module'; import { FlexLayoutModule } from '@angular/flex-layout'; import { ColorPickerModule } from 'ngx-color-picker'; -import { NgxDnDModule } from '@swimlane/ngx-dnd'; +import { NgxDnDModule } from '@withinpixels/ngx-dnd'; import { NgxDatatableModule } from '@swimlane/ngx-datatable'; import { FuseMatSidenavHelperDirective, FuseMatSidenavTogglerDirective } from '../directives/mat-sidenav-helper/mat-sidenav-helper.directive'; diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html index c395c2b6..de15be48 100644 --- a/src/app/main/content/apps/dashboards/project/project.component.html +++ b/src/app/main/content/apps/dashboards/project/project.component.html @@ -566,7 +566,7 @@ - + {{cell.value}} {{cell.icon}} diff --git a/src/app/main/content/apps/e-commerce/order/order.component.html b/src/app/main/content/apps/e-commerce/order/order.component.html index 9e6b7e9f..ff88a56d 100644 --- a/src/app/main/content/apps/e-commerce/order/order.component.html +++ b/src/app/main/content/apps/e-commerce/order/order.component.html @@ -359,13 +359,13 @@ - {{product.price | currency:'USD':true}} + {{product.price | currency:'USD':'symbol'}} {{product.quantity}} - {{product.total | currency:'USD':true}} + {{product.total | currency:'USD':'symbol'}} @@ -375,19 +375,19 @@ SUBTOTAL - {{order.subtotal | currency:'USD':true}} + {{order.subtotal | currency:'USD':'symbol'}} TAX - {{order.tax | currency:'USD':true}} + {{order.tax | currency:'USD':'symbol'}} DISCOUNT - -{{order.discount | currency:'USD':true}} + -{{order.discount | currency:'USD':'symbol'}} TOTAL - {{order.total | currency:'USD':true}} + {{order.total | currency:'USD':'symbol'}} diff --git a/src/app/main/content/apps/e-commerce/orders/orders.component.html b/src/app/main/content/apps/e-commerce/orders/orders.component.html index fc143877..1e5e1622 100644 --- a/src/app/main/content/apps/e-commerce/orders/orders.component.html +++ b/src/app/main/content/apps/e-commerce/orders/orders.component.html @@ -75,7 +75,7 @@ Total

- {{order.total | currency:'USD':true}} + {{order.total | currency:'USD':'symbol'}}

diff --git a/src/app/main/content/apps/e-commerce/products/products.component.html b/src/app/main/content/apps/e-commerce/products/products.component.html index 3d459378..976436aa 100644 --- a/src/app/main/content/apps/e-commerce/products/products.component.html +++ b/src/app/main/content/apps/e-commerce/products/products.component.html @@ -92,7 +92,7 @@ Price

- {{product.priceTaxIncl | currency:'USD':true}} + {{product.priceTaxIncl | currency:'USD':'symbol'}}

diff --git a/src/app/main/content/apps/file-manager/file-list/file-list.component.html b/src/app/main/content/apps/file-manager/file-list/file-list.component.html index 5e793c0f..9de20bc1 100644 --- a/src/app/main/content/apps/file-manager/file-list/file-list.component.html +++ b/src/app/main/content/apps/file-manager/file-list/file-list.component.html @@ -4,7 +4,7 @@ - + diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html index 58a0f95c..07edc09f 100644 --- a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html +++ b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html @@ -33,7 +33,7 @@ *fuseIfOnDom [@animate]="{value:'*',params:{delay:'200ms'}}">
- +
diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html index 52a74963..c8d7df5b 100644 --- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html +++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html @@ -1,6 +1,6 @@
+ class="header p-24 pb-4" ngClass="mat-accent-bg" ngClass.gt-md="white-fg">