diff --git a/package.json b/package.json index f85ddf0e..8cb4aaa2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fuse2", - "version": "1.3.3", + "version": "1.3.4", "license": "https://themeforest.net/licenses/terms/regular", "scripts": { "ng": "ng", @@ -19,24 +19,24 @@ "private": true, "dependencies": { "@agm/core": "1.0.0-beta.2", - "@angular/animations": "5.2.0", - "@angular/cdk": "5.0.4", - "@angular/common": "5.2.0", - "@angular/compiler": "5.2.0", - "@angular/core": "5.2.0", + "@angular/animations": "5.2.1", + "@angular/cdk": "5.1.0", + "@angular/common": "5.2.1", + "@angular/compiler": "5.2.1", + "@angular/core": "5.2.1", "@angular/flex-layout": "2.0.0-beta.12", - "@angular/forms": "5.2.0", - "@angular/http": "5.2.0", - "@angular/material": "5.0.4", - "@angular/material-moment-adapter": "5.0.4", - "@angular/platform-browser": "5.2.0", - "@angular/platform-browser-dynamic": "5.2.0", - "@angular/router": "5.2.0", + "@angular/forms": "5.2.1", + "@angular/http": "5.2.1", + "@angular/material": "5.1.0", + "@angular/material-moment-adapter": "5.1.0", + "@angular/platform-browser": "5.2.1", + "@angular/platform-browser-dynamic": "5.2.1", + "@angular/router": "5.2.1", "@ngrx/effects": "4.1.1", "@ngrx/router-store": "4.1.1", "@ngrx/store": "4.1.1", "@ngrx/store-devtools": "4.1.1", - "@ngx-translate/core": "9.0.2", + "@ngx-translate/core": "9.1.1", "@swimlane/ngx-charts": "7.0.1", "@swimlane/ngx-datatable": "11.1.7", "@swimlane/ngx-dnd": "3.1.0", @@ -53,32 +53,32 @@ "ngx-color-picker": "5.3.0", "ngx-cookie-service": "1.0.10", "perfect-scrollbar": "1.3.0", - "prismjs": "1.9.0", + "prismjs": "1.10.0", "rxjs": "5.5.6", "web-animations-js": "2.3.1", "zone.js": "0.8.20" }, "devDependencies": { - "@angular/cli": "1.6.3", - "@angular/compiler-cli": "5.2.0", - "@angular/language-service": "5.2.0", + "@angular/cli": "1.6.4", + "@angular/compiler-cli": "5.2.1", + "@angular/language-service": "5.2.1", "@angularclass/hmr": "2.1.3", - "@types/jasmine": "2.5.54", + "@types/jasmine": "2.8.4", "@types/jasminewd2": "2.0.3", "@types/node": "6.0.96", "codelyzer": "4.0.2", - "jasmine-core": "2.6.4", - "jasmine-spec-reporter": "4.1.1", - "karma": "1.7.1", - "karma-chrome-launcher": "2.1.1", + "jasmine-core": "2.8.0", + "jasmine-spec-reporter": "4.2.1", + "karma": "2.0.0", + "karma-chrome-launcher": "2.2.0", "karma-cli": "1.0.1", "karma-coverage-istanbul-reporter": "1.3.3", "karma-jasmine": "1.1.1", "karma-jasmine-html-reporter": "0.2.2", "protractor": "5.1.2", "ts-node": "3.2.2", - "tslint": "5.7.0", - "typescript": "2.4.2", + "tslint": "5.9.1", + "typescript": "2.5.3", "webpack-bundle-analyzer": "2.9.2" } } diff --git a/src/app/core/scss/core.scss b/src/app/core/scss/core.scss index 65a50aa0..96b899b3 100644 --- a/src/app/core/scss/core.scss +++ b/src/app/core/scss/core.scss @@ -1,9 +1,9 @@ // ngx-datatable -@import '~@swimlane/ngx-datatable/release/index.css'; -@import '~@swimlane/ngx-datatable/release/themes/material.css'; -@import '~@swimlane/ngx-datatable/release/assets/icons.css'; +@import '~@swimlane/ngx-datatable/release/themes/material'; + // Perfect scrollbar -@import '~perfect-scrollbar/css/perfect-scrollbar.css'; +@import '~perfect-scrollbar/css/perfect-scrollbar'; + // Fuse @import "fuse"; diff --git a/src/app/core/scss/partials/plugins/_ngx-datatable.scss b/src/app/core/scss/partials/plugins/_ngx-datatable.scss index 2ef90a6a..bdd69726 100644 --- a/src/app/core/scss/partials/plugins/_ngx-datatable.scss +++ b/src/app/core/scss/partials/plugins/_ngx-datatable.scss @@ -98,3 +98,68 @@ } } } + +[class*="datatable-icon-"] { + font-family: 'Material Icons'; + font-weight: normal; + font-style: normal; + font-size: 24px; + line-height: 1; + letter-spacing: normal; + text-transform: none; + display: inline-block; + white-space: nowrap; + word-wrap: normal; + direction: ltr; + -webkit-font-feature-settings: 'liga'; + -webkit-font-smoothing: antialiased; +} + +.datatable-icon-filter:before { + content: "filter_list"; +} +.datatable-icon-collapse:before { + content: "unfold_less"; +} +.datatable-icon-expand:before { + content: "unfold_more"; +} +.datatable-icon-close:before { + content: "close"; +} +.datatable-icon-up:before { + content: "keyboard_arrow_up"; +} +.datatable-icon-down:before { + content: "keyboard_arrow_down"; +} +.datatable-icon-sort:before { + content: "sort"; +} +.datatable-icon-done:before { + content: "done"; +} +.datatable-icon-done-all:before { + content: "done_all"; +} +.datatable-icon-search:before { + content: "search"; +} +.datatable-icon-pin:before { + content: "lock"; +} +.datatable-icon-add:before { + content: "add"; +} +.datatable-icon-left:before { + content: "chevron_left"; +} +.datatable-icon-right:before { + content: "chevron_right"; +} +.datatable-icon-skip:before { + content: "skip_next"; +} +.datatable-icon-prev:before { + content: "skip_previous"; +} \ No newline at end of file diff --git a/src/app/main/quick-panel/quick-panel.component.scss b/src/app/main/quick-panel/quick-panel.component.scss index adf1239c..be16d852 100644 --- a/src/app/main/quick-panel/quick-panel.component.scss +++ b/src/app/main/quick-panel/quick-panel.component.scss @@ -1,8 +1,8 @@ fuse-quick-panel { display: flex; - width: 330px; - min-width: 330px; - max-width: 330px; + width: 280px; + min-width: 280px; + max-width: 280px; z-index: 99; flex-direction: column;