From f1f78b9bae93fe9a07cc3ebdc743eb71ac78c29e Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 28 May 2018 11:49:02 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

---
 src/app/layout/default/header/header.component.html |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/layout/default/header/header.component.html b/src/app/layout/default/header/header.component.html
index ec763c0..1c81766 100644
--- a/src/app/layout/default/header/header.component.html
+++ b/src/app/layout/default/header/header.component.html
@@ -1,7 +1,7 @@
 <div class="logo">
     <a [routerLink]="['/']">
-        <img class="expanded" src="./assets/img/logo-full.svg" alt="{{settings.app.name}}" style="max-height:40px;" />
-        <img class="collapsed" src="./assets/img/logo.svg" alt="{{settings.app.name}}" style="max-height:30px;" />
+        <img class="expanded" src="./assets/img/logo_100x40.png" alt="{{settings.app.name}}" style="max-height:40px;" />
+        <img class="collapsed" src="./assets/img/logo_30x30.png" alt="{{settings.app.name}}" style="max-height:30px;" />
     </a>
 </div>
 <div class="top-nav-wrap">
@@ -59,7 +59,7 @@
                 <div class="item" nz-dropdown>
                     <i class="anticon anticon-setting"></i>
                 </div>
-                <div nz-menu style="width:200px">
+                <div nz-menu style="width:200px;">
                     <div nz-menu-item class="theme-switch">
                         <header-theme></header-theme>
                     </div>

--
Gitblit v1.8.0