EMP-252: Remove logo (#211)

valitydev · Feb 3, 2025 · c9d409a · c9d409a
1 parent 2d534ef
commit c9d409a
Show file tree

Hide file tree

Showing 14 changed files with 15 additions and 85 deletions.
diff --git 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
diff --git a/src/app/home/brand/brand.component.scss b/src/app/home/brand/brand.component.scss
diff --git a/src/app/home/brand/brand.component.ts b/src/app/home/brand/brand.component.ts
diff --git a/src/app/home/brand/brand.module.ts b/src/app/home/brand/brand.module.ts
diff --git a/src/app/home/brand/index.ts b/src/app/home/brand/index.ts
diff --git a/src/app/home/mobile-grid/mobile-grid.component.html b/src/app/home/mobile-grid/mobile-grid.component.html
@@ -14,20 +14,12 @@
     </mat-drawer>
     <mat-drawer-content>
         <div class="dsh-mobile-grid-content" fxLayout="column" fxLayoutGap="24px">
-            <div
-                class="dsh-mobile-grid-content-actions"
-                fxLayout="row"
-                fxLayoutAlign="start center"
-                fxLayoutGap="24px"
-            >
-                <dsh-bi
-                    class="dsh-mobile-grid-toggle-button"
-                    icon="list"
-                    size="lg"
-                    (click)="openSideNav()"
-                ></dsh-bi>
-                <dsh-brand></dsh-brand>
-            </div>
+            <dsh-bi
+                class="dsh-mobile-grid-toggle-button"
+                icon="list"
+                size="lg"
+                (click)="openSideNav()"
+            ></dsh-bi>
             <ng-content></ng-content>
         </div>
     </mat-drawer-content>

diff --git a/src/app/home/mobile-grid/mobile-grid.module.ts b/src/app/home/mobile-grid/mobile-grid.module.ts
@@ -5,16 +5,13 @@ 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';
 
 @NgModule({
     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
@@ -1,6 +1,5 @@
-<div class="dsh-toolbar" fxLayout fxLayoutAlign="center center" fxLayoutGap="24px">
-    <dsh-brand fxFlex fxLayoutAlign="start"></dsh-brand>
-    <div fxFlex fxLayoutAlign="center">
+<div class="dsh-toolbar">
+    <div fxLayoutAlign="center">
         <nav [tabPanel]="tabPanel" class="dsh-top-tab-nav-bar" fitInkBarToContent mat-tab-nav-bar>
             <a
                 #rla="routerLinkActive"
@@ -16,5 +15,5 @@
         </nav>
         <mat-tab-nav-panel #tabPanel></mat-tab-nav-panel>
     </div>
-    <dsh-actionbar fxFlex fxLayoutAlign="end"></dsh-actionbar>
+    <dsh-actionbar fxLayoutAlign="end"></dsh-actionbar>
 </div>
diff --git 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
@@ -7,15 +7,13 @@ 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';
 
 @NgModule({
     imports: [
         CommonModule,
         FlexLayoutModule,
-        BrandModule,
         ActionbarModule,
         RouterModule,
         MatTabsModule,

diff --git a/src/assets/icons/logo.svg b/src/assets/icons/logo.svg
diff --git a/src/favicon.ico b/src/favicon.ico
diff --git 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"
         />
-        <link href="favicon.ico" rel="icon" type="image/x-icon" />
+        <!-- <link href="favicon.ico" rel="icon" type="image/x-icon" /> -->
         <link
             href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,&subset=cyrillic"
             rel="stylesheet"