From 42ac7e8242e0e6fa51816449f4d73f5e80114b9a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Mar 2018 10:08:56 +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 | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/app/layout/default/header/header.component.html b/src/app/layout/default/header/header.component.html
index d8b1b51..962e8b5 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">
@@ -13,11 +13,13 @@
</div>
</li>
<!-- Github Page -->
+ <!--
<li>
<a class="item" href="//github.com/cipchk/ng-alain" target="_blank">
<i class="anticon anticon-github"></i>
</a>
</li>
+ -->
<!-- Lock Page -->
<li class="hidden-xs">
<div class="item" [routerLink]="['/pages/lock']">
@@ -34,17 +36,23 @@
<header-search class="header-search" [toggleChange]="searchToggleStatus"></header-search>
<ul class="top-nav">
<!-- Notify -->
+ <!--
<li>
<header-notify></header-notify>
</li>
+ -->
<!-- Task -->
+ <!--
<li class="hidden-xs">
<header-task></header-task>
</li>
+ -->
<!-- App Icons -->
+ <!--
<li class="hidden-xs">
<header-icon></header-icon>
</li>
+ -->
<!-- Settings -->
<li class="hidden-xs">
<nz-dropdown nzTrigger="click" nzPlacement="bottomRight">
@@ -61,9 +69,11 @@
<div nz-menu-item>
<header-storage></header-storage>
</div>
+ <!--
<div nz-menu-item>
<header-i18n></header-i18n>
</div>
+ -->
</div>
</nz-dropdown>
</li>
--
Gitblit v1.8.0