Skip to content

Bug 226 dark mode bugs 1 #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thekevinm merged 2 commits into from
May 13, 2024
Merged

Bug 226 dark mode bugs 1 #227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7773228
#226 - Dark Mode Bug Fixes
Yi-Jacob May 13, 2024
8bde03f
more fixes
Yi-Jacob May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/app/adf-home/df-welcome-page/df-welcome-page.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ <h3>
</aside>
</section>

<mat-divider></mat-divider>
<!-- <mat-divider></mat-divider>

<section class="platforms-section">
<h3>
Expand Down Expand Up @@ -87,5 +87,5 @@ <h4 id="javascript-examples-heading">
</article>
</section>
<mat-divider></mat-divider>
<df-download-page></df-download-page>
<df-download-page></df-download-page> -->
</div>
102 changes: 53 additions & 49 deletions src/app/shared/components/df-side-nav/df-side-nav.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,20 @@
[class.logged-in]="isLoggedIn$ | async">
<ng-container *ngIf="isLoggedIn$ | async">
<mat-toolbar class="tool-bar">
<button
mat-icon-button
(click)="sideNav.toggle()"
[attr.aria-label]="'toggleNav' | transloco">
<fa-icon [icon]="faBars"></fa-icon>
</button>
<img class="logo" src="assets/img/logo.png" alt="Logo" routerLink="/" />
<div class="button-wrapper">
<button
mat-icon-button
(click)="sideNav.toggle()"
[attr.aria-label]="'toggleNav' | transloco"
class="toggle-icon">
<fa-icon [icon]="faBars" class="toggle-icon"></fa-icon>
</button>
<img class="logo" src="assets/img/logo.png" alt="Logo" routerLink="/" />
</div>
<div class="search-bar">
<fa-icon [icon]="faMagnifyingGlass" class="search-icon"></fa-icon>
<input type="text" class="search-input" placeholder="Search" />
</div>
<span class="spacer"></span>
<ng-container *ngIf="availableLanguages.length > 1">
<button
Expand Down Expand Up @@ -87,12 +94,6 @@ <h3>API Scripting</h3>
</div>
</ng-container>
<mat-nav-list *ngIf="isLoggedIn$ | async">
<button mat-button (click)="handleSearchClick()">
{{ 'searchFeatures' | transloco }}
<span>
<fa-icon [icon]="faMagnifyingGlass"></fa-icon>
</span>
</button>
<ng-container
*ngTemplateOutlet="
navList;
Expand All @@ -101,44 +102,38 @@ <h3>API Scripting</h3>
</mat-nav-list>
</mat-sidenav>
<mat-sidenav-content class="sidenav-content">
<ng-container *ngIf="isLoggedIn$ | async">
<div class="banner" *ngIf="(hasError$ | async) === false">
<h1 class="page-header">
<ng-container *ngFor="let breadcrumb of breadCrumbs; index as i">
<ng-container *ngIf="breadcrumb.path; else current">
<a [routerLink]="breadcrumb.path" class="breadcrumb-link"
><ng-component
<div class="content-wrapper">
<ng-container *ngIf="isLoggedIn$ | async">
<div class="banner" *ngIf="(hasError$ | async) === false">
<h1 class="page-header">
<ng-container *ngFor="let breadcrumb of breadCrumbs; index as i">
<ng-container *ngIf="breadcrumb.path; else current">
<a [routerLink]="breadcrumb.path" class="breadcrumb-link"
><ng-component
*ngTemplateOutlet="breadcrumbLabel"></ng-component>
</a>
</ng-container>

<ng-template #current>
<ng-component
*ngTemplateOutlet="breadcrumbLabel"></ng-component>
<ng-template #breadcrumbLabel>
<ng-container *ngIf="breadcrumb.translationKey; else label">
<span>{{ breadcrumb.translationKey | transloco }}</span>
</ng-container>
<ng-template #label>
<span>{{ breadcrumb.label }}</span>
</ng-template>
</ng-template>
<ng-template #breadcrumbLabel>
<ng-container *ngIf="breadcrumb.translationKey; else label">
<span>{{ breadcrumb.translationKey | transloco }}</span>
</ng-container>
<ng-template #label>
<span>{{ breadcrumb.label }}</span>
</ng-template>
</a>
</ng-container>

<ng-template #current>
<ng-component
*ngTemplateOutlet="breadcrumbLabel"></ng-component>
</ng-template>
<ng-template #breadcrumbLabel>
<ng-container *ngIf="breadcrumb.translationKey; else label">
<span>{{ breadcrumb.translationKey | transloco }}</span>
</ng-container>
<ng-template #label>
<span>{{ breadcrumb.label }}</span>
</ng-template>
</ng-template>
<span *ngIf="i !== breadCrumbs.length - 1"> / </span>
</ng-container>
</h1>
<span *ngIf="i !== breadCrumbs.length - 1"> / </span>
</ng-container>
</h1>
</div>
</ng-container>
<div class="main" [class.no-error]="(hasError$ | async) === false">
<ng-content></ng-content>
</div>
</ng-container>
<div class="main" [class.no-error]="(hasError$ | async) === false">
<ng-content></ng-content>
</div>
</mat-sidenav-content>
</mat-sidenav-container>
Expand All @@ -152,7 +147,12 @@ <h1 class="page-header">
class="nav-item"
[class.active]="isActive(item)"
(click)="handleNavClick(item)">
{{ navLabel(item.path) | transloco }}
<span class="nav-item">
<ng-container *ngIf="item?.icon">
<img [src]="item.icon" [alt]="item.path" />
</ng-container>
{{ navLabel(item.path) | transloco }}
</span>
</button>
</div>
<ng-template #subRoutes>
Expand All @@ -161,7 +161,11 @@ <h1 class="page-header">
[class.mat-elevation-z0]="true"
[expanded]="isActive(item)">
<mat-expansion-panel-header class="parent-route">
{{ navLabel(item.path) | transloco }}
<span class="nav-item">
<ng-container *ngIf="item?.icon">
<img [src]="item.icon" [alt]="item.path" /> </ng-container
>{{ navLabel(item.path) | transloco }}
</span>
</mat-expansion-panel-header>
<mat-nav-list>
<ng-container
Expand Down
Loading