Merge pull request #36 from nck974/add-logo

[FEATURE] Add a diogenes logo
nck974 · Sep 14, 2023 · dd0edad · dd0edad
2 parents 724218c + c6e1e74
commit dd0edad
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 4 deletions.
diff --git a/ng-diogenes/angular.json b/ng-diogenes/angular.json
@@ -26,7 +26,7 @@
             "tsConfig": "tsconfig.app.json",
             "inlineStyleLanguage": "scss",
             "assets": [
-              "src/favicon.ico",
+              "src/assets/logo/logo_transparent.png",
               "src/assets"
             ],
             "styles": [

diff --git a/ng-diogenes/src/app/pages/category-detail/category-detail.component.scss b/ng-diogenes/src/app/pages/category-detail/category-detail.component.scss
@@ -1,6 +1,7 @@
 .card {
     margin: 1rem;
     max-width: 70rem;
+    min-width: 35rem;
 }
 
 .center-card {

diff --git a/ng-diogenes/src/app/pages/inventory/inventory.component.html b/ng-diogenes/src/app/pages/inventory/inventory.component.html
@@ -1,7 +1,10 @@
 <mat-toolbar>
     <mat-toolbar-row>
         <div class="select-items-container">
-            xxxx
+            <span class="logo-container">
+                <img class="logo" src="assets/logo/logo_transparent.png" alt="Logo">
+                Diogenes
+            </span>
             <app-inventory-menu></app-inventory-menu>
         </div>
     </mat-toolbar-row>

diff --git a/ng-diogenes/src/app/pages/inventory/inventory.component.scss b/ng-diogenes/src/app/pages/inventory/inventory.component.scss
@@ -5,7 +5,7 @@
     justify-content: space-between;
 }
 
-.extended-size-row{
+.extended-size-row {
     min-height: 80px;
 }
 
@@ -14,4 +14,15 @@
     bottom: 20px;
     right: 20px;
     z-index: 1;
+}
+
+.logo {
+    width: 50px;
+    height: 50px;
+    margin-right: 0.5rem;
+}
+
+.logo-container {
+    display: flex;
+    align-items: center;
 }
diff --git a/ng-diogenes/src/assets/logo/logo.jpg b/ng-diogenes/src/assets/logo/logo.jpg
diff --git a/ng-diogenes/src/assets/logo/logo_transparent.png b/ng-diogenes/src/assets/logo/logo_transparent.png
diff --git a/ng-diogenes/src/favicon.ico b/ng-diogenes/src/favicon.ico
diff --git a/ng-diogenes/src/index.html b/ng-diogenes/src/index.html
@@ -5,7 +5,7 @@
   <title>Diogenes</title>
   <base href="/">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
+  <link rel="icon" type="image/x-icon" href="assets/logo/logo_transparent.png">
   <!-- Load environment variables -->
   <script src="assets/env.js"></script>
   <link rel="preconnect" href="https://fonts.gstatic.com">