Changeset 91bfcf4

Timestamp:

11/04/21 17:28:50 (3 years ago)

Author:

Стојков Марко <mst@…>

Branches:

dev

Children:

68d02ca, dd264cb

Parents:

b9d7ae5 (diff), 6193ffe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged feature/favicon into dev

Location:

src/Clients/Angular/finki-chattery

Files:

• angular.json (modified) (2 diffs)
• src/app/shared-app/components/generic/header/header.component.html (modified) (1 diff)
• src/assets/images/logo.png (added)
• src/favicon.png (added)
• src/index.html (modified) (1 diff)
• src/styles.scss (modified) (1 diff)

src/Clients/Angular/finki-chattery/angular.json

@@ -28 +28 @@
             "aot": true,
             "assets": [
-              "src/favicon.ico",
+              "src/favicon.png",
               "src/assets",
               "src/callback.html",
@@ -99 +99 @@
             "karmaConfig": "karma.conf.js",
             "assets": [
-              "src/favicon.ico",
+              "src/favicon.png",
               "src/assets"
             ],

src/Clients/Angular/finki-chattery/src/app/shared-app/components/generic/header/header.component.html

@@ -1 +1 @@
 <mat-toolbar>
   <mat-toolbar-row>
-    <span class="cursor" (click)="navigateFromLogo()">FinkiChattery</span>
+    <span fxLayout="row start" class="cursor" (click)="navigateFromLogo()"
+      ><img
+        class="padding-top-sm"
+        fxFlex="16%"
+        fxFlex.md="30%"
+        fxFlex.sm="40%"
+        fxFlex.xs="100%"
+        alt="finki-chattery"
+        src="assets/images/logo.png"
+    /></span>
     <span class="right"></span>
 

src/Clients/Angular/finki-chattery/src/index.html

@@ -6 +6 @@
     <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="favicon.png" />
     <link rel="preconnect" href="https://fonts.gstatic.com" />
     <link href="https://fonts.googleapis.com/css2?family=Roboto:wght@300;400;500&display=swap" rel="stylesheet" />

src/Clients/Angular/finki-chattery/src/styles.scss

@@ -6 +6 @@
   margin: 0;
   font-family: Roboto, sans-serif;
-}
-
-.logo {
-  width: 200px;
-  height: 35px;
 }