2
0
MaxKey 2 жил өмнө
parent
commit
5a9f23542e

+ 7 - 3
maxkey-web-frontend/maxkey-web-app/src/app/layout/basic/basic.component.ts

@@ -39,8 +39,12 @@ import { LayoutDefaultOptions } from '../../theme/layout-default';
     <layout-default [options]="options" [asideUser]="asideUserTpl" [content]="contentTpl" [customError]="null">
       <layout-default-header-item direction="left" *ngIf="!inst.custom">
         <a href="#">
-          <img src="./assets/logo.jpg" alt="logo" style="height: 50px;height: 50px;float: left;" />
-          <div class="alain-default__header-title"> Max<span style="color: #FFD700;">Key</span>{{ 'mxk.title' | i18n }} </div>
+          <img src="./assets/logo.png" alt="logo" style="height: 50px;height: 50px;float: left;" />
+          <div class="alain-default__header-title">
+            <span style="color: #000099;">Max</span>
+            <span style="color: #FFD700;">Key</span>
+            {{ 'mxk.title' | i18n }}
+          </div>
         </a>
       </layout-default-header-item>
 
@@ -149,5 +153,5 @@ export class LayoutBasicComponent implements OnInit {
       });
     }
   }
-  constructor(private authnService: AuthnService, private settingsService: SettingsService, private router: Router) { }
+  constructor(private authnService: AuthnService, private settingsService: SettingsService, private router: Router) {}
 }

+ 6 - 2
maxkey-web-frontend/maxkey-web-app/src/app/layout/passport/passport.component.html

@@ -2,11 +2,15 @@
   <div nz-row style="border-bottom: 1px solid #e5e5e5; min-height: 60px; text-shadow: 0 1px 0 #fff">
     <div nz-col nzMd="2"></div>
     <div nz-col nzMd="2" style="text-align: right">
-      <img *ngIf="!inst.custom" style="margin-top: 6px" class="logo" src="./assets/logo.jpg" />
+      <img *ngIf="!inst.custom" style="margin-top: 6px" class="logo" src="./assets/logo.png" />
       <img *ngIf="inst.custom" style="margin-top: 6px" class="logo" src="{{ inst.logo }}" />
     </div>
     <div nz-col nzMd="10">
-      <div *ngIf="!inst.custom" class="title">Max<span style="color: #ffd700">Key</span>{{ 'mxk.title' | i18n }}</div>
+      <div *ngIf="!inst.custom" class="title">
+        <span style="color: #000099">Max</span>
+        <span style="color: #ffd700">Key</span>
+        {{ 'mxk.title' | i18n }}
+      </div>
       <div *ngIf="inst.custom" class="title">{{ inst.title }}</div>
     </div>
     <div nz-col nzMd="6"></div>

BIN
maxkey-web-frontend/maxkey-web-app/src/assets/logo.png


BIN
maxkey-web-frontend/maxkey-web-app/src/favicon.ico


+ 4 - 2
maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/basic/basic.component.ts

@@ -37,7 +37,7 @@ import { LayoutDefaultOptions } from '../../theme/layout-default';
     <layout-default [options]="options" [asideUser]="asideUserTpl" [content]="contentTpl" [customError]="null">
       <layout-default-header-item direction="left" *ngIf="!inst.custom">
         <a href="#">
-          <img src="./assets/logo.jpg" alt="logo" style="height: 50px;height: 50px;float: left;" />
+          <img src="./assets/logo.png" alt="logo" style="height: 50px;height: 50px;float: left;" />
           <div
             class="alain-default__nav-item_title"
             style="letter-spacing: 2px;
@@ -46,7 +46,9 @@ import { LayoutDefaultOptions } from '../../theme/layout-default';
               width: 450px;
               margin-top: 12px;"
           >
-            Max<span style="color: #FFD700;">Key</span>{{ 'mxk.title' | i18n }}
+            <span style="color: #000099;">Max</span>
+            <span style="color: #FFD700;">Key</span>
+            {{ 'mxk.title' | i18n }}
           </div>
         </a>
       </layout-default-header-item>

+ 5 - 2
maxkey-web-frontend/maxkey-web-mgt-app/src/app/layout/passport/passport.component.html

@@ -2,11 +2,14 @@
   <div nz-row style="border-bottom: 1px solid #e5e5e5; min-height: 60px; text-shadow: 0 1px 0 #fff">
     <div nz-col nzMd="2"></div>
     <div nz-col nzMd="2" style="text-align: right">
-      <img *ngIf="!inst.custom" style="margin-top: 6px" class="logo" src="./assets/logo.jpg" />
+      <img *ngIf="!inst.custom" style="margin-top: 6px" class="logo" src="./assets/logo.png" />
       <img *ngIf="inst.custom" style="margin-top: 6px" class="logo" src="{{ inst.logo }}" />
     </div>
     <div nz-col nzMd="10">
-      <div *ngIf="!inst.custom" class="title"> Max<span style="color: #ffd700">Key</span> {{ 'mxk.title' | i18n }}
+      <div *ngIf="!inst.custom" class="title">
+        <span style="color: #000099">Max</span>
+        <span style="color: #ffd700">Key</span>
+        {{ 'mxk.title' | i18n }}
       </div>
       <div *ngIf="inst.custom" class="title">{{ inst.title }}</div>
     </div>

BIN
maxkey-web-frontend/maxkey-web-mgt-app/src/assets/logo.png


BIN
maxkey-web-frontend/maxkey-web-mgt-app/src/favicon.ico


BIN
maxkey-webs/maxkey-web-maxkey/src/main/resources/static/favicon.ico


BIN
maxkey-webs/maxkey-web-mgt/src/main/resources/static/favicon.ico