diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 7231ae98b..a0e09e239 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -20,13 +20,9 @@ jobs: run: | printf "$APP_ENV_FILE" > dist/browser/assets/appConfig.json printf "$AUTH_ENV_FILE" > dist/browser/assets/authConfig.json - echo $FAVICO | base64 -d > dist/browser/favicon.ico - printf "$LOGO" > dist/browser/assets/icons/logo.svg env: APP_ENV_FILE: ${{secrets.APP_CONFIG_CF}} AUTH_ENV_FILE: ${{secrets.AUTH_CONFIG_CF}} - FAVICO: ${{secrets.FAVICON_BASE}} - LOGO: ${{secrets.LOGO_SVG}} - name: Publish to CF Pages uses: cloudflare/pages-action@1 with: diff --git a/src/app/home/brand/brand.component.html b/src/app/home/brand/brand.component.html deleted file mode 100644 index a6381356f..000000000 --- a/src/app/home/brand/brand.component.html +++ /dev/null @@ -1,3 +0,0 @@ -
- -
diff --git a/src/app/home/brand/brand.component.scss b/src/app/home/brand/brand.component.scss deleted file mode 100644 index 4c3103fa2..000000000 --- a/src/app/home/brand/brand.component.scss +++ /dev/null @@ -1,20 +0,0 @@ -$height: 48px; - -:host { - height: $height; -} - -mat-icon { - cursor: pointer; - outline: none; - - &, - ::ng-deep svg { - height: 100%; - width: auto; - } -} - -.brand-wrapper { - height: 100%; -} diff --git a/src/app/home/brand/brand.component.ts b/src/app/home/brand/brand.component.ts deleted file mode 100644 index 8c607cefa..000000000 --- a/src/app/home/brand/brand.component.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; - -@Component({ - selector: 'dsh-brand', - templateUrl: 'brand.component.html', - styleUrls: ['./brand.component.scss'], - changeDetection: ChangeDetectionStrategy.OnPush, -}) -export class BrandComponent { - @Input() navigationLink = '/'; -} diff --git a/src/app/home/brand/brand.module.ts b/src/app/home/brand/brand.module.ts deleted file mode 100644 index 85214b6a3..000000000 --- a/src/app/home/brand/brand.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; -import { NgModule } from '@angular/core'; -import { MatIconModule } from '@angular/material/icon'; -import { RouterModule } from '@angular/router'; - -import { BrandComponent } from './brand.component'; - -@NgModule({ - declarations: [BrandComponent], - exports: [BrandComponent], - imports: [RouterModule, MatIconModule], - providers: [provideHttpClient(withInterceptorsFromDi())], -}) -export class BrandModule {} diff --git a/src/app/home/brand/index.ts b/src/app/home/brand/index.ts deleted file mode 100644 index ffe68385c..000000000 --- a/src/app/home/brand/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './brand.module'; -export * from './brand.component'; diff --git a/src/app/home/mobile-grid/mobile-grid.component.html b/src/app/home/mobile-grid/mobile-grid.component.html index 685e74413..91637c32a 100644 --- a/src/app/home/mobile-grid/mobile-grid.component.html +++ b/src/app/home/mobile-grid/mobile-grid.component.html @@ -14,20 +14,12 @@
-
- - -
+
diff --git a/src/app/home/mobile-grid/mobile-grid.module.ts b/src/app/home/mobile-grid/mobile-grid.module.ts index 5b3399fbb..77bc0d522 100644 --- a/src/app/home/mobile-grid/mobile-grid.module.ts +++ b/src/app/home/mobile-grid/mobile-grid.module.ts @@ -5,8 +5,6 @@ import { FlexLayoutModule } from 'ng-flex-layout'; import { BootstrapIconModule } from '@dsh/components/indicators'; -import { BrandModule } from '../brand'; - import { MobileGridComponent } from './mobile-grid.component'; import { MobileMenuModule } from './mobile-menu'; @@ -14,7 +12,6 @@ import { MobileMenuModule } from './mobile-menu'; imports: [ CommonModule, MatSidenavModule, - BrandModule, FlexLayoutModule, MobileMenuModule, BootstrapIconModule, diff --git a/src/app/home/toolbar/toolbar.component.html b/src/app/home/toolbar/toolbar.component.html index e29e1054b..ec46222da 100644 --- a/src/app/home/toolbar/toolbar.component.html +++ b/src/app/home/toolbar/toolbar.component.html @@ -1,6 +1,5 @@ -
- -
+
+
- +
diff --git a/src/app/home/toolbar/toolbar.component.scss b/src/app/home/toolbar/toolbar.component.scss index 3e0e1d11b..dc3ffd849 100644 --- a/src/app/home/toolbar/toolbar.component.scss +++ b/src/app/home/toolbar/toolbar.component.scss @@ -2,9 +2,14 @@ $dsh-toolbar-height: 48px; :host { display: block; + padding-left: 16px; } .dsh-toolbar { user-select: none; height: $dsh-toolbar-height; + display: flex; + align-items: center; + justify-content: space-between; + gap: 24px; } diff --git a/src/app/home/toolbar/toolbar.module.ts b/src/app/home/toolbar/toolbar.module.ts index 27c2ad4b1..b26752018 100644 --- a/src/app/home/toolbar/toolbar.module.ts +++ b/src/app/home/toolbar/toolbar.module.ts @@ -7,7 +7,6 @@ import { FlexLayoutModule } from 'ng-flex-layout'; import { SectionsLinksModule } from '@dsh/app/shared/services/sections-links'; import { ActionbarModule } from '../actionbar'; -import { BrandModule } from '../brand'; import { ToolbarComponent } from './toolbar.component'; @@ -15,7 +14,6 @@ import { ToolbarComponent } from './toolbar.component'; imports: [ CommonModule, FlexLayoutModule, - BrandModule, ActionbarModule, RouterModule, MatTabsModule, diff --git a/src/assets/icons/logo.svg b/src/assets/icons/logo.svg deleted file mode 100644 index 12dbfd5df..000000000 --- a/src/assets/icons/logo.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/favicon.ico b/src/favicon.ico deleted file mode 100644 index f47fe9583..000000000 Binary files a/src/favicon.ico and /dev/null differ diff --git a/src/index.html b/src/index.html index 73afe5049..cc4d4b7e3 100644 --- a/src/index.html +++ b/src/index.html @@ -9,7 +9,7 @@ content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport" /> - +