Skip to content

Commit

Permalink
fix(module:tabs): fix tabs style error (NG-ZORRO#3570)
Browse files Browse the repository at this point in the history
  • Loading branch information
vthinkxie committed Jun 14, 2019
1 parent fbeb091 commit d9c439e
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 12 deletions.
7 changes: 4 additions & 3 deletions components/tabs/nz-tabs.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,13 @@ describe('tabs', () => {
expect(titles[1].innerText).toBe('template');
});

it('should content work', () => {
it('should content work', fakeAsync(() => {
fixture.detectChanges();
tick();
fixture.detectChanges();
const contents = tabs.nativeElement.querySelectorAll('.ant-tabs-tabpane');
expect(contents[0].innerText).toBe('Content 1');
expect(contents[1].innerText).toBe('Content 2');
});
}));

it('should selectedIndex work', fakeAsync(() => {
fixture.detectChanges();
Expand Down
1 change: 1 addition & 0 deletions components/tabs/nz-tabset.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
[class.ant-tabs-left-content]="nzTabPosition === 'left'"
[class.ant-tabs-right-content]="nzTabPosition === 'right'"
[class.ant-tabs-content-animated]="tabPaneAnimated"
[class.ant-tabs-card-content]="nzType === 'card'"
[class.ant-tabs-content-no-animated]="!tabPaneAnimated"
[style.margin-left.%]="(tabPositionMode === 'horizontal') && tabPaneAnimated && (-(nzSelectedIndex || 0 ) * 100)">
<div nz-tab-body
Expand Down
4 changes: 2 additions & 2 deletions docs/introduce.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ $ ng add ng-zorro-antd

在任何形式的参与前,请先阅读 [贡献者文档](https://github.com/NG-ZORRO/ng-zorro-antd/blob/master/CONTRIBUTING.md)。如果你希望参与贡献,欢迎 [Pull Request](https://github.com/NG-ZORRO/ng-zorro-antd/pulls),或给我们 [报告 Bug](http://ng.ant.design/issue-helper/#/en)

> 强烈推荐阅读 [《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way)(本指南不提供此项目的实际支持服务!)[《如何向开源社区提问题》](https://github.com/seajs/seajs/issues/545)[《如何有效地报告 Bug》](http://www.chiark.greenend.org.uk/%7Esgtatham/bugs-cn.html)[《如何向开源项目提交无法解答的问题》](https://zhuanlan.zhihu.com/p/25795393),更好的问题更容易获得帮助。
> 强烈推荐阅读 [《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way)[《如何向开源社区提问题》](https://github.com/seajs/seajs/issues/545)[《如何有效地报告 Bug》](http://www.chiark.greenend.org.uk/%7Esgtatham/bugs-cn.html)[《如何向开源项目提交无法解答的问题》](https://zhuanlan.zhihu.com/p/25795393),更好的问题更容易获得帮助。
## 社区互助

Expand All @@ -96,4 +96,4 @@ $ ng add ng-zorro-antd
3. [![Gitter](https://img.shields.io/gitter/room/ng-zorro/ng-zorro-antd.svg?style=flat-square)](https://gitter.im/ng-zorro/ng-zorro-antd)
4. 加入钉钉 NG-ZORRO 自助服务群(中文)

<img src="https://img.alicdn.com/tfs/TB1aYpsHAvoK1RjSZPfXXXPKFXa-750-990.jpg" width="300">
<img src="https://img.alicdn.com/tfs/TB1aRk.clCw3KVjSZFlXXcJkFXa-750-990.jpg" width="300">
1 change: 0 additions & 1 deletion integration/angular-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"@angular/compiler": "file:lib/@angular/compiler",
"@angular/core": "file:lib/@angular/core",
"@angular/forms": "file:lib/@angular/forms",
"@angular/http": "file:lib/@angular/http",
"@angular/platform-browser": "file:lib/@angular/platform-browser",
"@angular/platform-browser-dynamic": "file:lib/@angular/platform-browser-dynamic",
"@angular/router": "file:lib/@angular/router",
Expand Down
1 change: 0 additions & 1 deletion integration/rollup/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"@angular/compiler": "file:lib/@angular/compiler",
"@angular/core": "file:lib/@angular/core",
"@angular/forms": "file:lib/@angular/forms",
"@angular/http": "file:lib/@angular/http",
"@angular/platform-browser": "file:lib/@angular/platform-browser",
"@angular/platform-browser-dynamic": "file:lib/@angular/platform-browser-dynamic",
"@angular/router": "file:lib/@angular/router",
Expand Down
3 changes: 1 addition & 2 deletions integration/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"@angular/compiler": "file:lib/@angular/compiler",
"@angular/core": "file:lib/@angular/core",
"@angular/forms": "file:lib/@angular/forms",
"@angular/http": "file:lib/@angular/http",
"@angular/platform-browser": "file:lib/@angular/platform-browser",
"@angular/platform-browser-dynamic": "file:lib/@angular/platform-browser-dynamic",
"@angular/router": "file:lib/@angular/router",
Expand All @@ -34,7 +33,7 @@
"@angular-devkit/build-optimizer": "~0.10.0",
"@angular/cli": "file:lib/@angular/cli",
"@angular/compiler-cli": "file:lib/@angular/compiler-cli",
"@ngtools/webpack": "~7.0.0",
"@ngtools/webpack": "~8.0.0",
"html-webpack-plugin": "^3.2.0",
"typescript": "file:lib/typescript",
"terser-webpack-plugin": "^1.1.0",
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,10 @@
"@angular/compiler-cli": "~8.0.0",
"@angular/core": "~8.0.0",
"@angular/forms": "~8.0.0",
"@angular/http": "~7.2.0",
"@angular/language-service": "~8.0.0",
"@angular/platform-browser": "~8.0.0",
"@angular/platform-server": "^8.0.0",
"@angular/platform-browser-dynamic": "~8.0.0",
"@angular/platform-server": "^8.0.0",
"@angular/pwa": "^0.800.1",
"@angular/router": "~8.0.0",
"@angular/service-worker": "~8.0.0",
Expand Down Expand Up @@ -92,7 +91,7 @@
"less": "^3.9.0",
"less-plugin-clean-css": "^1.5.1",
"lint-staged": "^8.1.5",
"marked": "^0.5.1",
"marked": "^0.6.2",
"ng-packagr": "^5.2.0",
"ngx-color": "^2.0.5",
"node-prismjs": "^0.1.1",
Expand Down

0 comments on commit d9c439e

Please sign in to comment.