Ger rid of additionals wrappers for additional theme (DevExpress#3)

marcwittke · Aug 31, 2018 · ba56bf8 · ba56bf8
1 parent f26db2b
commit ba56bf8
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 45 deletions.
diff --git a/src/app/layout/layout.component.html b/src/app/layout/layout.component.html
@@ -1,5 +1,8 @@
 <div class="container">
-    <app-header class="header" (menuToggle)="menuOpened = !menuOpened;"></app-header>
+    <app-header 
+        class="header dx-additional-color-scheme-dark" 
+        (menuToggle)="menuOpened = !menuOpened;">
+    </app-header>
     <dx-drawer
         class="content"
         [openedStateMode]="menuMode"
@@ -8,7 +11,9 @@
         [shading]="shaderEnabled"
         [(opened)]="menuOpened">
 
-        <app-navigation-menu *dxTemplate="let dataMenu of 'panel'" 
+        <app-navigation-menu 
+            class="dx-additional-color-scheme-dark"
+            *dxTemplate="let dataMenu of 'panel'" 
             (selectedItemChanged)="navigationChanged($event)">
         </app-navigation-menu>
 

diff --git a/src/app/shared/components/header/header.component.html b/src/app/shared/components/header/header.component.html
@@ -1,37 +1,37 @@
-<div class="dx-additional-color-scheme-dark">
-    <dx-toolbar>
-        <dxi-item 
-            location="before"
-            widget="dxButton"
-            [options]="{
-                icon: 'menu',
-                onClick: toggleMenu
-            }">
-        </dxi-item>
-        <dxi-item 
-            location="after"
-            locateInMenu="auto"
-            widget="dxButton"
-            [visible]="!isUserAuthorized"
-            [options]="{
-                icon: 'user',
-                text:'Login',
-                onClick: onShowLoginPopup
-            }">
-        </dxi-item>
-        <dxi-item 
-            location="after"
-            locateInMenu="auto"
-            [visible]="isUserAuthorized">
-            <div *dxTemplate>
-                <div class="image-container">
-                    <img class="user-image" src="https://js.devexpress.com/Demos/WidgetsGallery/JSDemos/images/employees/01.png">
-                </div>
-                {{userLogin}}
+
+<dx-toolbar>
+    <dxi-item 
+        location="before"
+        widget="dxButton"
+        [options]="{
+            icon: 'menu',
+            onClick: toggleMenu
+        }">
+    </dxi-item>
+    <dxi-item 
+        location="after"
+        locateInMenu="auto"
+        widget="dxButton"
+        [visible]="!isUserAuthorized"
+        [options]="{
+            icon: 'user',
+            text:'Login',
+            onClick: onShowLoginPopup
+        }">
+    </dxi-item>
+    <dxi-item 
+        location="after"
+        locateInMenu="auto"
+        [visible]="isUserAuthorized">
+        <div *dxTemplate>
+            <div class="image-container">
+                <img class="user-image" src="https://js.devexpress.com/Demos/WidgetsGallery/JSDemos/images/employees/01.png">
             </div>
-        </dxi-item>
-    </dx-toolbar>
-</div>
+            {{userLogin}}
+        </div>
+    </dxi-item>
+</dx-toolbar>
+
 <dx-popup [(visible)]="showLoginPopup" title="Login" height="auto" [width]="300">
     <div *dxTemplate="let data of 'content'">
         <app-login (onLoginClick)="loginClick($event)"></app-login>

diff --git a/src/app/shared/components/navigation-menu/navigation-menu.component.html b/src/app/shared/components/navigation-menu/navigation-menu.component.html
@@ -1,8 +1,6 @@
-<div class="dx-additional-color-scheme-dark" style="height: 100%;">
-    <dx-tree-view
-        [items]="menuItems"
-        (onItemClick)="onItemSelectionChanged($event)" 
-        [selectByClick]="true"
-        selectionMode="single">
-    </dx-tree-view>    
-</div>
+<dx-tree-view
+    [items]="menuItems"
+    (onItemClick)="onItemSelectionChanged($event)" 
+    [selectByClick]="true"
+    selectionMode="single">
+</dx-tree-view>
diff --git a/src/app/shared/components/navigation-menu/navigation-menu.component.ts b/src/app/shared/components/navigation-menu/navigation-menu.component.ts
@@ -1,6 +1,5 @@
 import { Component, NgModule, Output, EventEmitter } from '@angular/core';
 import { DxTreeViewModule } from 'devextreme-angular/ui/tree-view';
-import { DxToolbarModule } from 'devextreme-angular/ui/toolbar';
 import { Router } from '@angular/router';
 
 @Component({
@@ -43,7 +42,7 @@ export class NavigationMenuComponent {
 }
 
 @NgModule({
-    imports: [ DxTreeViewModule, DxToolbarModule ],
+    imports: [ DxTreeViewModule ],
     declarations: [ NavigationMenuComponent ],
     exports: [ NavigationMenuComponent ]
 })