purchasing/fuse-angular
3
0
Fork 0
mirror of https://github.com/richard-loafle/fuse-angular.git synced 2025-10-31 20:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into skeleton

Browse Source
This commit is contained in:
Sercan Yemen 2017-11-13 11:09:27 +03:00
commit 2a5d15694c
6 changed files with 72 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "fuse2",
"version": "1.2.0",
"version": "1.2.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -43,17 +43,17 @@
}
},
"@angular/animations": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.0.tgz",
"integrity": "sha1-ta0ZnGf5P3WVREd+/+ZnnhVJkfs=",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@angular/animations/-/animations-5.0.1.tgz",
"integrity": "sha1-qSsrGGpuWjGp8VhJEd1qp+FsXeE=",
"requires": {
"tslib": "1.8.0"
}
},
"@angular/cdk": {
"version": "2.0.0-beta.12",
"resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-2.0.0-beta.12.tgz",
"integrity": "sha1-OiQ8tiuT9OA5EgunD5ANyeI1Yi4=",
"version": "5.0.0-rc0",
"resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-5.0.0-rc0.tgz",
"integrity": "sha512-wZg/mzHisiTieVt7Q/YNPB+r07PHvjoAT3+0mwyIP7wuC00W8BJLPhTZd/tIM5q7Nd69kuA1HSx1qLkcmlCZkw==",
"requires": {
"tslib": "1.8.0"
}
@ -124,25 +124,25 @@
}
},
"@angular/common": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.0.tgz",
"integrity": "sha1-+W1mpRe5ldG6mygwnxXC41lnWCU=",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-5.0.1.tgz",
"integrity": "sha1-QwBas8i4/68Xaq+zuGupMcPkvfk=",
"requires": {
"tslib": "1.8.0"
}
},
"@angular/compiler": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.0.tgz",
"integrity": "sha1-uf+/GMijnYt9rOxHMZOpDiTMK8k=",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-5.0.1.tgz",
"integrity": "sha1-f9TH+ku770wUaWL6lGuCczCmyO0=",
"requires": {
"tslib": "1.8.0"
}
},
"@angular/compiler-cli": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.0.tgz",
"integrity": "sha1-Dsu5N9hKT43ZTwwqR7B9LkaUyFM=",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-5.0.1.tgz",
"integrity": "sha1-Um3BuzlPsWrZFmAe6pqgDrRLT/8=",
"dev": true,
"requires": {
"chokidar": "1.7.0",
@ -152,9 +152,9 @@
}
},
"@angular/core": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.0.tgz",
"integrity": "sha1-T5dqIl993fNJkvLK2CTJVDpG9Mg=",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@angular/core/-/core-5.0.1.tgz",
"integrity": "sha1-pKdK/H4gWNMLgmPrbWbarOn0J7o=",
"requires": {
"tslib": "1.8.0"
}
@ -168,55 +168,55 @@
}
},
"@angular/forms": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.0.tgz",
"integrity": "sha1-x/3fo1OWdZrphSkgowzdqMQe0d4=",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@angular/forms/-/forms-5.0.1.tgz",
"integrity": "sha1-afMDxME9o8qg3mNDdYg4i2rWKyE=",
"requires": {
"tslib": "1.8.0"
}
},
"@angular/http": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.0.tgz",
"integrity": "sha1-Byiivgz7sHhyfF64fUyF1T/smlE=",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@angular/http/-/http-5.0.1.tgz",
"integrity": "sha1-NQy99jz6yJOWE9dT/wce1YpgVhs=",
"requires": {
"tslib": "1.8.0"
}
},
"@angular/language-service": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.0.0.tgz",
"integrity": "sha1-bMu2n0dXJw3QTsWFfTdjSy8CxAw=",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-5.0.1.tgz",
"integrity": "sha1-hp4J29bj2VwRfAYtId0f2SCtRNY=",
"dev": true
},
"@angular/material": {
"version": "2.0.0-beta.12",
"resolved": "https://registry.npmjs.org/@angular/material/-/material-2.0.0-beta.12.tgz",
"integrity": "sha1-cbbQt7AhiR5dDjaIwdS9eMdFf1g=",
"version": "5.0.0-rc0",
"resolved": "https://registry.npmjs.org/@angular/material/-/material-5.0.0-rc0.tgz",
"integrity": "sha512-ZW9gy3c8l2NbFfX9DRYSW+i67pPoL9DZoMCb16STQlhdDfwwAWNpjGF0etXkXw30hDnRCMGVVJVU+45cNXJspA==",
"requires": {
"tslib": "1.8.0"
}
},
"@angular/platform-browser": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.0.tgz",
"integrity": "sha1-xwOPfN6AcFtiAUiXIx4YLuyXb+0=",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-5.0.1.tgz",
"integrity": "sha1-FIld0w7Sow7nuZx2t2R0j0bBqGI=",
"requires": {
"tslib": "1.8.0"
}
},
"@angular/platform-browser-dynamic": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.0.tgz",
"integrity": "sha1-iH4QbIsQOwQVz2FWpCXabYP0yJ0=",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.0.1.tgz",
"integrity": "sha1-Fttn1S1FMVY6sVQpxr3+GLwb7cg=",
"requires": {
"tslib": "1.8.0"
}
},
"@angular/router": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.0.tgz",
"integrity": "sha1-/ktSGmc4QIvOMPk6U0mRQMk6T3Y=",
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/@angular/router/-/router-5.0.1.tgz",
"integrity": "sha1-msCPKTAu9gzf08eBDZbCZd7EY9Y=",
"requires": {
"tslib": "1.8.0"
}
@ -268,9 +268,9 @@
"integrity": "sha512-918ksaRl8RvGWGOjpUCywTS1MnLTqHki53XXibyhZkmHGSP5yLkcArBAFhFLvtQTTbuX8KSz2WFKxwaJ3JuJFw=="
},
"@swimlane/ngx-datatable": {
"version": "10.4.0",
"resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-10.4.0.tgz",
"integrity": "sha512-wTV/64vEGPFlcpE+ezTN18baOsNXyfLLvdmhEoaDQt2OJtTKtNxJkze24w71utoJxutQRrfHJUVSkAF4CLNckA=="
"version": "11.0.3",
"resolved": "https://registry.npmjs.org/@swimlane/ngx-datatable/-/ngx-datatable-11.0.3.tgz",
"integrity": "sha512-feJ9Ep0xddgC1IuNEqxWcTnoSPc3drzY+Bn27RFq+ztXYf3mHsLMxerMqFyVaLPnMrZKttZ7MX48gXzOkSVavw=="
},
"@types/jasmine": {
"version": "2.5.54",
@ -6380,9 +6380,9 @@
}
},
"moment": {
"version": "2.19.1",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.19.1.tgz",
"integrity": "sha1-VtoaLRy/AdOLfhr8McELz6GSkWc="
"version": "2.19.2",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.19.2.tgz",
"integrity": "sha512-Rf6jiHPEfxp9+dlzxPTmRHbvoFXsh2L/U8hOupUMpnuecHQmI6cF6lUbJl3QqKPko1u6ujO+FxtcajLVfLpAtA=="
},
"move-concurrently": {
"version": "1.0.1",

32
package.json
View File

@ -1,6 +1,6 @@
{
"name": "fuse2",
"version": "1.2.0",
"version": "1.2.1",
"license": "",
"scripts": {
"ng": "ng",
@ -16,21 +16,21 @@
"private": true,
"dependencies": {
"@agm/core": "1.0.0-beta.2",
"@angular/animations": "5.0.0",
"@angular/cdk": "2.0.0-beta.12",
"@angular/common": "5.0.0",
"@angular/compiler": "5.0.0",
"@angular/core": "5.0.0",
"@angular/animations": "5.0.1",
"@angular/cdk": "5.0.0-rc0",
"@angular/common": "5.0.1",
"@angular/compiler": "5.0.1",
"@angular/core": "5.0.1",
"@angular/flex-layout": "2.0.0-beta.10",
"@angular/forms": "5.0.0",
"@angular/http": "5.0.0",
"@angular/material": "2.0.0-beta.12",
"@angular/platform-browser": "5.0.0",
"@angular/platform-browser-dynamic": "5.0.0",
"@angular/router": "5.0.0",
"@angular/forms": "5.0.1",
"@angular/http": "5.0.1",
"@angular/material": "5.0.0-rc0",
"@angular/platform-browser": "5.0.1",
"@angular/platform-browser-dynamic": "5.0.1",
"@angular/router": "5.0.1",
"@ngx-translate/core": "8.0.0",
"@swimlane/ngx-charts": "6.1.0",
"@swimlane/ngx-datatable": "10.4.0",
"@swimlane/ngx-datatable": "11.0.3",
"@withinpixels/ngx-dnd": "3.1.0",
"angular-calendar": "0.21.3",
"classlist.js": "1.1.20150312",
@ -39,7 +39,7 @@
"hammerjs": "2.0.8",
"highlight.js": "9.12.0",
"intl": "1.2.5",
"moment": "2.19.1",
"moment": "2.19.2",
"ngx-color-picker": "4.4.0",
"ngx-cookie-service": "1.0.9",
"perfect-scrollbar": "1.0.3",
@ -49,8 +49,8 @@
},
"devDependencies": {
"@angular/cli": "1.5.0",
"@angular/compiler-cli": "5.0.0",
"@angular/language-service": "5.0.0",
"@angular/compiler-cli": "5.0.1",
"@angular/language-service": "5.0.1",
"@angularclass/hmr": "2.1.3",
"@types/jasmine": "2.5.54",
"@types/jasminewd2": "2.0.3",

2
src/app/core/components/material-color-picker/material-color-picker.component.html
View File

@ -2,7 +2,7 @@
type="button"
class="mat-elevation-z1"
[matMenuTriggerFor]="colorMenu"
(onMenuOpen)="onMenuOpen()"
(menuOpened)="onMenuOpen()"
[ngClass]="'mat-'+selectedPalette+'-'+selectedHue+'-bg'">
<mat-icon>palette</mat-icon>
</button>

2
src/app/core/components/shortcuts/shortcuts.component.html
View File

@ -26,7 +26,7 @@
</div>
<button mat-icon-button [matMenuTriggerFor]="addMenu" matTooltip="Click to add/remove shortcut"
(onMenuOpen)="onMenuOpen()">
(menuOpened)="onMenuOpen()">
<mat-icon class="amber-600-fg">star</mat-icon>
</button>

4
src/app/core/components/shortcuts/shortcuts.component.ts
View File

@ -149,7 +149,9 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy
onMenuOpen()
{
this.searchInputField.nativeElement.focus();
setTimeout(() => {
this.searchInputField.nativeElement.focus();
});
}
showMobileShortcutsPanel()

5
src/app/core/scss/partials/_angular-material-fix.scss
View File

@ -59,3 +59,8 @@ mat-sidenav-container {
width: 14px;
height: 7px;
}
// Fix: "Input underlines has wrong color opacity value"
.mat-form-field-underline {
background-color: rgba(0, 0, 0, 0.12);
}