diff --git a/.angular-cli.json b/.angular-cli.json index 05580290..49a41f5d 100644 --- a/.angular-cli.json +++ b/.angular-cli.json @@ -25,9 +25,6 @@ "styles": [ ], "scripts": [ - "../node_modules/jquery/dist/jquery.js", - "../node_modules/tether/dist/js/tether.js", - "../node_modules/bootstrap/dist/js/bootstrap.js", "../node_modules/tinymce/tinymce.js", "../node_modules/tinymce/themes/modern/theme.js", "../node_modules/tinymce/plugins/link/plugin.js", diff --git a/package-lock.json b/package-lock.json index 7f12a6eb..3219de8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -144,7 +144,7 @@ "@types/node": { "version": "6.0.74", "resolved": "https://registry.npmjs.org/@types/node/-/node-6.0.74.tgz", - "integrity": "sha512-fjUDu2//vsHodfhWeo6bkJcY+YjHAnQSaOahcY6M3hvl7KIHf/5EosXLTJB8gTN2Yfsfaov+FpUtkR/gfgrQXA==", + "integrity": "sha1-sM1wyHx7qVD1ad1CA1sQZWKV4lk=", "dev": true }, "@types/q": { @@ -308,7 +308,7 @@ "aproba": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz", - "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==", + "integrity": "sha1-RcZikJTeTpb2k+9+q3SuB5wkD8E=", "dev": true }, "are-we-there-yet": { @@ -675,11 +675,6 @@ "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", "dev": true }, - "bootstrap": { - "version": "4.0.0-alpha.6", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.0.0-alpha.6.tgz", - "integrity": "sha1-T1TdM6wN6sOyhAe8LffsYIhpycg=" - }, "brace-expansion": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.7.tgz", @@ -3075,7 +3070,7 @@ "glob": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=", "dev": true }, "glob-base": { @@ -3795,7 +3790,7 @@ "istanbul-api": { "version": "1.1.9", "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.9.tgz", - "integrity": "sha512-zV14oa+hjBNP3gJTM/BzNdJpInHKbZ9cLIEwVasuaTUA1ebF9TBOIfcC5SDAE3C11rXxOw3KSimKGMiFz6PpWQ==", + "integrity": "sha1-KCeSDTgNQobYV9V6KWioQduKfsg=", "dev": true }, "istanbul-instrumenter-loader": { @@ -3815,37 +3810,37 @@ "istanbul-lib-coverage": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz", - "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==", + "integrity": "sha1-c7+5mIhSmUFck9OKPprfeEp3qdo=", "dev": true }, "istanbul-lib-hook": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz", - "integrity": "sha512-3U2HB9y1ZV9UmFlE12Fx+nPtFqIymzrqCksrXujm3NVbAZIJg/RfYgO1XiIa0mbmxTjWpVEVlkIZJ25xVIAfkQ==", + "integrity": "sha1-3WYH8DB2V4/n1vKmMM8UO0m6zdw=", "dev": true }, "istanbul-lib-instrument": { "version": "1.7.2", "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.2.tgz", - "integrity": "sha512-lPgUY+Pa5dlq2/l0qs1PJZ54QPSfo+s4+UZdkb2d0hbOyrEIAbUJphBLFjEyXBdeCONgGRADFzs3ojfFtmuwFA==", + "integrity": "sha1-YBSwPTRw+3djjVgCUIwlXAYxLlY=", "dev": true }, "istanbul-lib-report": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz", - "integrity": "sha512-tvF+YmCmH4thnez6JFX06ujIA19WPa9YUiwjc1uALF2cv5dmE3It8b5I8Ob7FHJ70H9Y5yF+TDkVa/mcADuw1Q==", + "integrity": "sha1-8OVfVmVf+jQiIIC3oM1HYOFAX8k=", "dev": true }, "istanbul-lib-source-maps": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz", - "integrity": "sha512-mukVvSXCn9JQvdJl8wP/iPhqig0MRtuWuD4ZNKo6vB2Ik//AmhAKe3QnPN02dmkRe3lTudFk3rzoHhwU4hb94w==", + "integrity": "sha1-pv4ay6jOCO68Y45XLilNJnAIqgw=", "dev": true }, "istanbul-reports": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.1.tgz", - "integrity": "sha512-P8G873A0kW24XRlxHVGhMJBhQ8gWAec+dae7ZxOBzxT4w+a9ATSPvRVK3LB1RAJ9S8bg2tOyWHAGW40Zd2dKfw==", + "integrity": "sha1-BCvlyJ4XW8P4ZSPKqynAFOd/7k4=", "dev": true, "dependencies": { "async": { @@ -3898,7 +3893,7 @@ "uglify-js": { "version": "2.8.28", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.28.tgz", - "integrity": "sha512-WqKNbmNJKzIdIEQu/U2ytgGBbhCy2PVks94GoetczOAJ/zCgVu2CuO7gguI5KPFGPtUtI1dmPQl6h0D4cPzypA==", + "integrity": "sha1-4zUDLfm7INy5GPFkWJ1a9H84g0o=", "dev": true, "optional": true, "dependencies": { @@ -3959,11 +3954,6 @@ "dev": true, "optional": true }, - "jquery": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz", - "integrity": "sha1-XE2d5lKvbNCncBVKYxu6ErAVx4c=" - }, "js-base64": { "version": "2.1.9", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz", @@ -4472,7 +4462,7 @@ "minimatch": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=", "dev": true }, "minimist": { @@ -4699,7 +4689,7 @@ "npmlog": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.0.tgz", - "integrity": "sha512-ocolIkZYZt8UveuiDS0yAkkIjid1o7lPG8cYm05yNYzBn8ykQtaiPMEGp8fY9tKdDgm8okpdKzkvu1y9hUYugA==", + "integrity": "sha1-3Fm+6F9k8A7UJO+yrweD3yXRwLU=", "dev": true }, "nth-check": { @@ -6867,7 +6857,7 @@ "walk-sync": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-0.3.2.tgz", - "integrity": "sha512-FMB5VqpLqOCcqrzA9okZFc0wq0Qbmdm396qJxvQZhDpyu0W95G9JCmp74tx7iyYnyOcBtUuKJsgIKAqjozvmmQ==", + "integrity": "sha1-SCcoCvxC0OA1NnxKTjHurA0Tb3U=", "dev": true }, "watchpack": { @@ -6976,7 +6966,7 @@ "uglify-js": { "version": "2.8.28", "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.28.tgz", - "integrity": "sha512-WqKNbmNJKzIdIEQu/U2ytgGBbhCy2PVks94GoetczOAJ/zCgVu2CuO7gguI5KPFGPtUtI1dmPQl6h0D4cPzypA==", + "integrity": "sha1-4zUDLfm7INy5GPFkWJ1a9H84g0o=", "dev": true, "dependencies": { "yargs": { @@ -7130,7 +7120,7 @@ "wide-align": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", - "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "integrity": "sha1-Vx4PGwYEY268DfwhsDObvjE0FxA=", "dev": true, "dependencies": { "is-fullwidth-code-point": { diff --git a/src/app/pages/ui-features/modals/modals.component.ts b/src/app/pages/ui-features/modals/modals.component.ts index dd0be64d..f7bce542 100644 --- a/src/app/pages/ui-features/modals/modals.component.ts +++ b/src/app/pages/ui-features/modals/modals.component.ts @@ -13,12 +13,12 @@ export class ModalsComponent { constructor(private modalService: NgbModal) { } showLargeModal() { - const activeModal = this.modalService.open(ModalComponent, { size: 'lg' }); + const activeModal = this.modalService.open(ModalComponent, { size: 'lg', container: 'nga-layout' }); activeModal.componentInstance.modalHeader = 'Large Modal'; } showSmallModal() { - const activeModal = this.modalService.open(ModalComponent, { size: 'sm' }); + const activeModal = this.modalService.open(ModalComponent, { size: 'sm', container: 'nga-layout' }); activeModal.componentInstance.modalHeader = 'Small Modal'; } @@ -27,6 +27,7 @@ export class ModalsComponent { const activeModal = this.modalService.open(ModalComponent, { size: 'sm', backdrop: 'static', + container: 'nga-layout', }); activeModal.componentInstance.modalHeader = 'Static modal'; diff --git a/src/app/shared.module.ts b/src/app/shared.module.ts index dab7f193..984292dd 100644 --- a/src/app/shared.module.ts +++ b/src/app/shared.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; -import { NgaCardModule } from '@nga/theme'; +import { NgaCardModule, NgaThemeModule } from '@nga/theme'; @NgModule({ exports: [ @@ -11,6 +11,7 @@ import { NgaCardModule } from '@nga/theme'; ReactiveFormsModule, RouterModule, NgaCardModule, + NgaThemeModule, ], }) export class SharedModule { }