Skip to content

fix issue#71 #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phodal merged 4 commits into from
Apr 12, 2020
Merged

fix issue#71 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd30d41
fix issue#71
Wynnfan Apr 11, 2020
830fccf
Merge remote-tracking branch 'upstream/master'
Wynnfan Apr 11, 2020
50bae59
update header and fix issue#71
Wynnfan Apr 11, 2020
46a9ca7
update class name
Wynnfan Apr 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 35 additions & 34 deletions src/app/app.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,40 @@
<mat-toolbar color="accent">
<mat-toolbar-row>
<button mat-button class="button-logo" routerLink="/home">
<img src="/assets/images/logo.svg" alt="logo" class="logo">
</button>
<span class="spacer"></span>
<div class="right">
<button mat-button routerLink="/home" routerLinkActive="active" i18n="@@home">首页</button>
<button mat-button routerLink="/case-study" routerLinkActive="active" i18n="@@case-study">案例学习</button>
<button mat-button routerLink="/pattern" routerLinkActive="active" i18n="@@pattern-rules">模式与原则</button>
<button mat-button routerLink="/practise" routerLinkActive="active" i18n="@@best-practise">最佳实践</button>
<button mat-button routerLink="/manual" routerLinkActive="active" i18n="@@manual">操作手册</button>
<button mat-button routerLink="/solution" routerLinkActive="active" i18n="@@solution">解决方案</button>
<button mat-button routerLink="/think-tank" routerLinkActive="active" i18n="@@think-tank">智库</button>

<mat-menu #appMenu="matMenu" backdropClass="nav-menu-wrapper">
<button mat-menu-item routerLink="/mobile" routerLinkActive="active" i18n="@@mobile">移动端</button>
<button mat-menu-item routerLink="/maturity" routerLinkActive="active" i18n="@@maturity">度量</button>
<button mat-menu-item routerLink="/report" routerLinkActive="active" i18n="@@report">年度报告</button>
<button mat-menu-item routerLink="/resources" routerLinkActive="active" i18n="@@resources">DevOps 相关资源</button>
</mat-menu>
<button mat-button [matMenuTriggerFor]="appMenu">
资源<mat-icon>arrow_drop_down</mat-icon>
<div class="app-header">
<mat-toolbar color="accent">
<mat-toolbar-row >
<button mat-button class="button-logo" routerLink="/home">
<img src="/assets/images/logo.svg" alt="logo" class="logo">
</button>
<span class="spacer"></span>
<div class="right">
<button mat-button routerLink="/home" routerLinkActive="active" i18n="@@home">首页</button>
<button mat-button routerLink="/case-study" routerLinkActive="active" i18n="@@case-study">案例学习</button>
<button mat-button routerLink="/pattern" routerLinkActive="active" i18n="@@pattern-rules">模式与原则</button>
<button mat-button routerLink="/practise" routerLinkActive="active" i18n="@@best-practise">最佳实践</button>
<button mat-button routerLink="/manual" routerLinkActive="active" i18n="@@manual">操作手册</button>
<button mat-button routerLink="/solution" routerLinkActive="active" i18n="@@solution">解决方案</button>
<button mat-button routerLink="/think-tank" routerLinkActive="active" i18n="@@think-tank">智库</button>

<mat-menu #toolsetMenu="matMenu" backdropClass="nav-menu-wrapper">
<button mat-menu-item routerLink="/tool" routerLinkActive="active">工具集</button>
<button mat-menu-item routerLink="/design" routerLinkActive="active">设计 DevOps</button>
<button mat-menu-item routerLink="/helper" routerLinkActive="active">Ledge 编辑器</button>
</mat-menu>
<mat-menu #appMenu="matMenu" backdropClass="nav-menu-wrapper">
<button mat-menu-item routerLink="/mobile" routerLinkActive="active" i18n="@@mobile">移动端</button>
<button mat-menu-item routerLink="/maturity" routerLinkActive="active" i18n="@@maturity">度量</button>
<button mat-menu-item routerLink="/report" routerLinkActive="active" i18n="@@report">年度报告</button>
<button mat-menu-item routerLink="/resources" routerLinkActive="active" i18n="@@resources">DevOps 相关资源</button>
</mat-menu>
<button mat-button [matMenuTriggerFor]="appMenu">
资源<mat-icon>arrow_drop_down</mat-icon>
</button>

<button mat-button [matMenuTriggerFor]="toolsetMenu">
工具<mat-icon>arrow_drop_down</mat-icon>
</button>
</div>
</mat-toolbar-row>
</mat-toolbar>
<mat-menu #toolsetMenu="matMenu" backdropClass="nav-menu-wrapper">
<button mat-menu-item routerLink="/tool" routerLinkActive="active">工具集</button>
<button mat-menu-item routerLink="/design" routerLinkActive="active">设计 DevOps</button>
<button mat-menu-item routerLink="/helper" routerLinkActive="active">Ledge 编辑器</button>
</mat-menu>

<button mat-button [matMenuTriggerFor]="toolsetMenu">
工具<mat-icon>arrow_drop_down</mat-icon>
</button>
</div>
</mat-toolbar-row>
</mat-toolbar>
</div>
<router-outlet></router-outlet>
1 change: 1 addition & 0 deletions src/app/presentation/home/home.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
.container {
position: relative;
z-index: 100;
top: 64px;

a {
text-decoration: none;
Expand Down
7 changes: 7 additions & 0 deletions src/styles/_material_ui.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
// Navigation Bar
.app-header {
position: fixed;
top: 0;
z-index: 999;
width: 100%;
}

.mat-toolbar {
box-shadow: 0 1px 0 0 $lighter-gray;

Expand Down