Skip to content

Commit

Permalink
releases: 1.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
cipchk committed Jul 27, 2018
1 parent df2f883 commit e7b7d57
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 7 deletions.
13 changes: 13 additions & 0 deletions docs/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,19 @@ title:
type: Other
---

### 1.2.0

`2018-7-27`

- 脚手架
- 增加 `ng-alain-version` 版本号至 `body` 元素,[3e1966](https://github.com/cipchk/ng-alain/commit/3e1966)
- 升级至 Angular 6.1.x 版本号,支持 typescript 2.9.x,[d0adcd](https://github.com/cipchk/ng-alain/commit/d0adcd)
- 重构引用 `node_modules/@delon` 开头的样式路径为 `~@delon`[67c771](https://github.com/cipchk/ng-alain/commit/67c771)
- @delon/theme
- 增加 `VERSION` 版本号
- Schematics
- 修复 `ng add ng-alain` 在 Angular Cli 6.1.x 下无法运行,[#601](https://github.com/cipchk/ng-alain/issues/601)

### 1.1.5

`2018-7-22`
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "delon",
"version": "1.1.5",
"version": "1.2.0",
"typings": "index.d.ts",
"description": "Delon is a set of essential modules for ng-alain.",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion scaffold
9 changes: 7 additions & 2 deletions src/app/layout.component.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { Component, OnInit } from '@angular/core';
import { MenuService, SettingsService, Menu } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd';

@Component({
selector: 'app-layout',
Expand Down Expand Up @@ -58,7 +59,7 @@ export class LayoutComponent implements OnInit {
text: 'Dashboard',
link: '/dashboard',
icon: 'anticon anticon-appstore-o',
badge: 5
badge: 5,
},
{
text: 'Level1',
Expand Down Expand Up @@ -105,7 +106,11 @@ export class LayoutComponent implements OnInit {
},
];

constructor(private menuSrv: MenuService, public settings: SettingsService) {}
constructor(
private menuSrv: MenuService,
public settings: SettingsService,
public msgSrv: NzMessageService,
) {}

toggleCollapsedSideabar() {
this.settings.setLayout('collapsed', !this.settings.layout.collapsed);
Expand Down
6 changes: 3 additions & 3 deletions src/styles.less
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// antd
@import 'node_modules/ng-zorro-antd/src/ng-zorro-antd.less';
@import '~ng-zorro-antd/src/ng-zorro-antd.less';
// alain
@import 'packages/theme/styles/index';
@import 'packages/abc/index';
@import '../packages/theme/styles/index';
@import '../packages/abc/index';

// 例如:内容区域背景色为白色
// @content-bg: #fff;
Expand Down

0 comments on commit e7b7d57

Please sign in to comment.