Skip to content

Commit

Permalink
added dark theme logo
Browse files Browse the repository at this point in the history
  • Loading branch information
sei-tspencer committed Aug 15, 2023
1 parent 0565afa commit d2a944e
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ <h2 class="icon-text">Administration</h2>
[src]="
(theme$ | async) === 'light-theme'
? '/assets/img/cmu-red-gray.png'
: '/assets/img/cmu-red-gray.png'
: '/assets/img/sei-logo-gray.png'
"
/>
</mat-sidenav>
Expand Down
27 changes: 24 additions & 3 deletions src/app/components/msel/msel.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@

<mat-list-item class="list-item background">
<div class="lefticon">
<button mat-icon-button title="Return to MSEL list" (click)="tabChange('<< Back')">
<button mat-icon-button title="Return to MSEL list" (click)="tabChange('Back')">
<mat-icon
inline="true"
class="primary mdi-36px"
fontIcon="mdi-chevron-double-left"
fontIcon="mdi-close-circle-outline"
></mat-icon>
</button>
</div>
Expand Down Expand Up @@ -75,7 +75,7 @@

<mat-list-item class="list-item background">
<div class="lefticon">
<button mat-icon-button title="Return to MSEL list" (click)="tabChange('<< Back')">
<button mat-icon-button title="Return to MSEL list" (click)="tabChange('Back')">
<mat-icon
inline="true"
class="primary mdi-36px"
Expand Down Expand Up @@ -109,7 +109,16 @@
</button>
</div>
</mat-list-item>
<mat-list-item class="background">&nbsp;</mat-list-item>
</mat-list>
<img
class="cmu-logo"
[src]="
(theme$ | async) === 'light-theme'
? '/assets/img/cmu-red-gray.png'
: '/assets/img/sei-logo-gray.png'
"
/>
</mat-sidenav>
<mat-sidenav-content class="content-frame">
<div class="main-content">
Expand Down Expand Up @@ -167,3 +176,15 @@
</div>
</mat-sidenav-content>
</mat-sidenav-container>
<img
class="small-logo"
[src]="
(theme$ | async) === 'light-theme'
? '/assets/img/cmu-red-gray.png'
: '/assets/img/sei-logo-gray.png'
"
/>
<br />&nbsp;
<br />&nbsp;
<br />&nbsp;

11 changes: 11 additions & 0 deletions src/app/components/msel/msel.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,14 @@
.full-width {
width: 100%;
}

.cmu-logo {
position: absolute;
left: 0;
bottom: 0;
width: 100%;
}

.small-logo {
width: 300px;
}
10 changes: 7 additions & 3 deletions src/app/components/msel/msel.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { Subject, Observable } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import {
Theme,
ComnAuthQuery
} from '@cmusei/crucible-common';
import {
Msel
Expand Down Expand Up @@ -60,7 +61,7 @@ export class MselComponent implements OnDestroy {
selectedMselId = '';
sideNavExpanded = true;
fontIconList = new Map<string, string>([
['Info', 'mdi-information-outline'],
['Info', 'mdi-note-outline'],
['Teams', 'mdi-account-group-outline'],
['Data Fields', 'mdi-view-column-outline'],
['Organizations', 'mdi-office-building-outline'],
Expand All @@ -71,6 +72,7 @@ export class MselComponent implements OnDestroy {
['Events', 'mdi-chart-timeline'],
['Exercise View', 'mdi-eye-outline'],
]);
theme$: Observable<Theme>;

constructor(
private activatedRoute: ActivatedRoute,
Expand All @@ -90,8 +92,10 @@ export class MselComponent implements OnDestroy {
private scenarioEventDataService: ScenarioEventDataService,
private teamDataService: TeamDataService,
private uiDataService: UIDataService,
private userMselRoleDataService: UserMselRoleDataService
private userMselRoleDataService: UserMselRoleDataService,
private authQuery: ComnAuthQuery
) {
this.theme$ = this.authQuery.userTheme$;
// subscribe to route changes
this.activatedRoute.queryParamMap.pipe(takeUntil(this.unsubscribe$)).subscribe(params => {
// load the selected MSEL data
Expand Down Expand Up @@ -138,7 +142,7 @@ export class MselComponent implements OnDestroy {
}

tabChange(tabName: string) {
if (tabName === '<< Back') {
if (tabName === 'Back') {
this.uiDataService.setMselTab(this.defaultTab);
this.router.navigate([], {
queryParams: { }
Expand Down
Binary file added src/assets/img/sei-logo-gray.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d2a944e

Please sign in to comment.