Fix for map view

This commit is contained in:
Piotr Pekala 2019-11-28 05:07:29 -08:00
parent 80207eda36
commit 6870f707bf
4 changed files with 8 additions and 17 deletions

View File

@ -28,6 +28,6 @@ export class AppComponent implements OnInit {
this.electronService.ipcRenderer.send('settings.changed', settings); this.electronService.ipcRenderer.send('settings.changed', settings);
}); });
} }
// this.themeService.setDarkMode(false); this.themeService.setDarkMode(true);
} }
} }

View File

@ -150,23 +150,23 @@
</div> </div>
<div id="show-menu-wrapper" [ngClass]="{lightTheme: isLightThemeEnabled, shadowed: !isProjectMapMenuVisible }" *ngIf="!readonly"> <div id="show-menu-wrapper" [ngClass]="{lightTheme: isLightThemeEnabled, shadowed: !isProjectMapMenuVisible }" *ngIf="!readonly">
<button class="arrow-button" mat-icon-button (click)="showMenu()"><mat-icon class="unmarked">keyboard_arrow_right</mat-icon></button> <button [ngClass]="{lightTheme: isLightThemeEnabled}" class="arrow-button" mat-icon-button (click)="showMenu()"><mat-icon class="unmarked">keyboard_arrow_right</mat-icon></button>
</div> </div>
<div id="menu-wrapper" [ngClass]="{lightTheme: isLightThemeEnabled, extended: isProjectMapMenuVisible }"> <div id="menu-wrapper" [ngClass]="{lightTheme: isLightThemeEnabled, extended: isProjectMapMenuVisible }">
<app-nodes-menu [server]="server" [project]="project"></app-nodes-menu> <app-nodes-menu [server]="server" [project]="project"></app-nodes-menu>
<mat-divider class="divider" [vertical]="true"></mat-divider> <mat-divider class="divider" [vertical]="true"></mat-divider>
<app-project-map-menu [server]="server" [project]="project"></app-project-map-menu> <app-project-map-menu [server]="server" [project]="project"></app-project-map-menu>
<button class="arrow-button" mat-icon-button (click)="hideMenu()"><mat-icon class="unmarked">keyboard_arrow_left</mat-icon></button> <button [ngClass]="{lightTheme: isLightThemeEnabled}" class="arrow-button" mat-icon-button (click)="hideMenu()"><mat-icon class="unmarked">keyboard_arrow_left</mat-icon></button>
</div> </div>
<app-context-menu [project]="project" [server]="server"></app-context-menu> <app-context-menu [project]="project" [server]="server"></app-context-menu>
</div> </div>
<div [ngClass]="{lightTheme: isLightThemeEnabled}" class="zoom-buttons"> <div [ngClass]="{lightTheme: isLightThemeEnabled}" class="zoom-buttons">
<button class="zoom-button" (click)="zoomIn()"><mat-icon>zoom_in</mat-icon></button> <button [ngClass]="{lightTheme: isLightThemeEnabled}" class="zoom-button" (click)="zoomIn()"><mat-icon>zoom_in</mat-icon></button>
<button class="zoom-button" (click)="resetZoom()"><mat-icon>adjust</mat-icon></button> <button [ngClass]="{lightTheme: isLightThemeEnabled}" class="zoom-button" (click)="resetZoom()"><mat-icon>adjust</mat-icon></button>
<button class="zoom-button" (click)="zoomOut()"><mat-icon>zoom_out</mat-icon></button> <button [ngClass]="{lightTheme: isLightThemeEnabled}" class="zoom-button" (click)="zoomOut()"><mat-icon>zoom_out</mat-icon></button>
</div> </div>
<app-progress></app-progress> <app-progress></app-progress>

View File

@ -103,14 +103,6 @@ mat-divider.divider {
color: gray; color: gray;
} }
.unmarked {
color: black!important;
}
.marked {
color: #0097a7!important;
}
.zoom-buttons { .zoom-buttons {
position: fixed; position: fixed;
background: #263238; background: #263238;
@ -125,7 +117,7 @@ mat-divider.divider {
width: 40px; width: 40px;
background: transparent; background: transparent;
border: none; border: none;
color: black; color: white;
font-size: 1.25rem; font-size: 1.25rem;
font-weight: bold; font-weight: bold;

View File

@ -13,8 +13,7 @@ export class ThemeService {
theme$: Observable<[string, boolean]>; theme$: Observable<[string, boolean]>;
public themeChanged = new EventEmitter<string>(); public themeChanged = new EventEmitter<string>();
//this should taken from memory public savedTheme: string = 'dark';
public savedTheme: string = 'light';
constructor( constructor(
rendererFactory: RendererFactory2, rendererFactory: RendererFactory2,