From 1f8c4477cf79d1d891d159580728ce8ea76d6934 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Mon, 25 Nov 2019 11:50:42 +0300
Subject: [PATCH] fix(theme-shared): wrong folder name

---
 .../src/lib/{contants => constants}/scripts.ts  |  0
 .../src/lib/{contants => constants}/styles.ts   | 16 ++++++++++++++--
 .../theme-shared/src/lib/theme-shared.module.ts | 17 +++++------------
 3 files changed, 19 insertions(+), 14 deletions(-)
 rename npm/ng-packs/packages/theme-shared/src/lib/{contants => constants}/scripts.ts (100%)
 rename npm/ng-packs/packages/theme-shared/src/lib/{contants => constants}/styles.ts (95%)

diff --git a/npm/ng-packs/packages/theme-shared/src/lib/contants/scripts.ts b/npm/ng-packs/packages/theme-shared/src/lib/constants/scripts.ts
similarity index 100%
rename from npm/ng-packs/packages/theme-shared/src/lib/contants/scripts.ts
rename to npm/ng-packs/packages/theme-shared/src/lib/constants/scripts.ts
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts b/npm/ng-packs/packages/theme-shared/src/lib/constants/styles.ts
similarity index 95%
rename from npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts
rename to npm/ng-packs/packages/theme-shared/src/lib/constants/styles.ts
index ee242277d5..0278fa5e00 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/constants/styles.ts
@@ -45,15 +45,27 @@ export default `
 }
 
 .modal-backdrop {
-  position: absolute !important;
+  position: fixed !important;
   top: 0 !important;
   left: 0 !important;
-  width: 100% !important;
+  width: calc(100% - 7px) !important;
   height: 100% !important;
   background-color: rgba(0, 0, 0, 0.6) !important;
   z-index: 1040 !important;
 }
 
+.modal::-webkit-scrollbar {
+  width: 7px;
+}
+
+.modal::-webkit-scrollbar-track {
+  background: #ddd;
+}
+
+.modal::-webkit-scrollbar-thumb {
+  background: #8a8686;
+}
+
 .modal-dialog {
   z-index: 1050 !important;
 }
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
index 50072f3d6d..f9cf4097cd 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/theme-shared.module.ts
@@ -14,7 +14,7 @@ import { ModalComponent } from './components/modal/modal.component';
 import { SortOrderIconComponent } from './components/sort-order-icon/sort-order-icon.component';
 import { TableEmptyMessageComponent } from './components/table-empty-message/table-empty-message.component';
 import { ToastComponent } from './components/toast/toast.component';
-import styles from './contants/styles';
+import styles from './constants/styles';
 import { TableSortDirective } from './directives/table-sort.directive';
 import { ErrorHandler } from './handlers/error.handler';
 import { chartJsLoaded$ } from './utils/widget-utils';
@@ -29,16 +29,7 @@ export function appendScript(injector: Injector) {
     import('chart.js').then(() => chartJsLoaded$.next(true));
 
     const lazyLoadService: LazyLoadService = injector.get(LazyLoadService);
-
-    return forkJoin(
-      lazyLoadService.load(
-        null,
-        'style',
-        styles,
-        'head',
-        'afterbegin',
-      ) /* lazyLoadService.load(null, 'script', scripts) */,
-    ).toPromise();
+    return lazyLoadService.load(null, 'style', styles, 'head', 'afterbegin').toPromise();
   };
 
   return fn;
@@ -75,6 +66,8 @@ export function appendScript(injector: Injector) {
   entryComponents: [ErrorComponent],
 })
 export class ThemeSharedModule {
+  constructor(private errorHandler: ErrorHandler) {}
+
   static forRoot(options = {} as RootParams): ModuleWithProviders {
     return {
       ngModule: ThemeSharedModule,
@@ -82,7 +75,7 @@ export class ThemeSharedModule {
         {
           provide: APP_INITIALIZER,
           multi: true,
-          deps: [Injector, ErrorHandler],
+          deps: [Injector],
           useFactory: appendScript,
         },
         { provide: MessageService, useClass: MessageService },