Skip to content

Commit

Permalink
fix(module:style): fix 4.6.1 sync style (#5727)
Browse files Browse the repository at this point in the history
  • Loading branch information
vthinkxie authored Aug 27, 2020
1 parent de8bad8 commit b5f96ca
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 23 deletions.
16 changes: 8 additions & 8 deletions components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@
"url": "https://github.com/NG-ZORRO/ng-zorro-antd/issues"
},
"dependencies": {
"@angular/cdk": "^10.0.2",
"@angular/cdk": "^10.0.0",
"@ant-design/icons-angular": "10.0.0-beta.0",
"date-fns": "^2.10.0",
"resize-observer-polyfill": "^1.5.1"
},
"peerDependencies": {
"@angular/animations": "^9.0.0",
"@angular/common": "^9.0.0",
"@angular/forms": "^9.0.0",
"@angular/core": "^9.0.0",
"@angular/platform-browser": "^9.0.0",
"@angular/router": "^9.0.0",
"rxjs": "~6.5.3"
"@angular/animations": "^10.0.0",
"@angular/common": "^10.0.0",
"@angular/forms": "^10.0.0",
"@angular/core": "^10.0.0",
"@angular/platform-browser": "^10.0.0",
"@angular/router": "^10.0.0",
"rxjs": "~6.5.5"
}
}
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
"classlist.js": "^1.1.20150312",
"clean-css": "~4.2.1",
"codecov": "^3.5.0",
"codelyzer": "^5.1.2",
"codelyzer": "^6.0.0",
"codesandbox": "^2.1.14",
"conventional-changelog-cli": "^2.0.23",
"detect-port": "^1.3.0",
Expand Down Expand Up @@ -99,13 +99,13 @@
"minimist": "^1.2.0",
"monaco-editor": "^0.20.0",
"ng-packagr": "^10.0.1",
"ngx-color": "^5.0.0",
"ngx-color": "^6.0.0",
"node-prismjs": "^0.1.2",
"parse5": "^5.1.1",
"prettier": "^2.0.2",
"prismjs": "^1.17.1",
"process": "^0.11.10",
"protractor": "~5.4.2",
"protractor": "~7.0.0",
"puppeteer": "^2.0.0",
"readline-sync": "^1.4.10",
"remark": "^11.0.1",
Expand Down
45 changes: 33 additions & 12 deletions scripts/site/_site/doc/theme.less
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,12 @@
'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
'Noto Color Emoji';
@code-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
@text-color: fade(@black, 65%);
@text-color: fade(@black, 85%);
@text-color-secondary: fade(@black, 45%);
@text-color-inverse: @white;
@icon-color: inherit;
@icon-color-hover: fade(@black, 75%);
@heading-color: fade(#000, 85%);
@heading-color-dark: fade(@white, 100%);
@heading-color: fade(@black, 85%);
@text-color-dark: fade(@white, 85%);
@text-color-secondary-dark: fade(@white, 65%);
@text-selection-bg: @primary-color;
Expand All @@ -66,6 +65,7 @@
@heading-2-size: ceil(@font-size-base * 2.14);
@heading-3-size: ceil(@font-size-base * 1.71);
@heading-4-size: ceil(@font-size-base * 1.42);
@heading-5-size: ceil(@font-size-base * 1.14);
// https://github.com/ant-design/ant-design/issues/20210
@line-height-base: 1.5715;
@border-radius-base: 2px;
Expand Down Expand Up @@ -202,6 +202,8 @@
@btn-height-lg: @height-lg;
@btn-height-sm: @height-sm;

@btn-line-height: @line-height-base;

@btn-circle-size: @btn-height-base;
@btn-circle-size-lg: @btn-height-lg;
@btn-circle-size-sm: @btn-height-sm;
Expand Down Expand Up @@ -236,10 +238,12 @@
@descriptions-item-trailing-colon: true;
@descriptions-item-label-colon-margin-right: 8px;
@descriptions-item-label-colon-margin-left: 2px;
@descriptions-extra-color: @text-color;

// Divider
@divider-text-padding: 1em;
@divider-orientation-margin: 5%;
@divider-color: rgba(0, 0, 0, 6%);

// Dropdown
@dropdown-selected-color: @primary-color;
Expand All @@ -262,7 +266,7 @@
@radio-button-hover-color: @primary-5;
@radio-button-active-color: @primary-7;
@radio-disabled-button-checked-bg: tint(@black, 90%);
@radio-disabled-button-checked-color: @text-color-inverse;
@radio-disabled-button-checked-color: @disabled-color;
@radio-wrapper-margin-right: 8px;

// Media queries breakpoints
Expand Down Expand Up @@ -321,7 +325,7 @@

// z-index list, order by `z-index`
@zindex-badge: auto;
@zindex-table-fixed: auto;
@zindex-table-fixed: 2;
@zindex-affix: 10;
@zindex-back-top: 10;
@zindex-picker-panel: 10;
Expand All @@ -333,7 +337,9 @@
@zindex-popover: 1030;
@zindex-dropdown: 1050;
@zindex-picker: 1050;
@zindex-tooltip: 1060;
@zindex-popoconfirm: 1060;
@zindex-tooltip: 1070;
@zindex-image: 1080;

// Animation
@animation-duration-slow: 0.3s; // Modal
Expand Down Expand Up @@ -375,12 +381,12 @@
@input-padding-horizontal-sm: @control-padding-horizontal-sm - 1px;
@input-padding-horizontal-lg: @input-padding-horizontal;
@input-padding-vertical-base: max(
round((@input-height-base - @font-size-base * @line-height-base) / 2 * 10) / 10 -
@border-width-base,
round((@input-height-base - @font-size-base * @line-height-base) / 2 * 10) / 10 -
@border-width-base,
3px
);
@input-padding-vertical-sm: max(
round((@input-height-sm - @font-size-base * @line-height-base) / 2 * 10) / 10 - @border-width-base,
round((@input-height-sm - @font-size-base * @line-height-base) / 2 * 10) / 10 - @border-width-base,
0
);
@input-padding-vertical-lg: ceil((@input-height-lg - @font-size-lg * @line-height-base) / 2 * 10) /
Expand Down Expand Up @@ -427,6 +433,9 @@
@select-multiple-item-height: @input-height-base - @input-padding-vertical-base * 2; // Normal 24px
@select-multiple-item-height-lg: 32px;
@select-multiple-item-spacing-half: ceil(@input-padding-vertical-base / 2);
@select-multiple-disabled-background: @input-disabled-bg;
@select-multiple-item-disabled-color: #bfbfbf;
@select-multiple-item-disabled-border-color: @select-border-color;

// Cascader
// ---
Expand Down Expand Up @@ -598,6 +607,9 @@
@table-expand-icon-bg: @component-background;
@table-selection-column-width: 60px;
@table-selection-extra-right: 0;
// Sticky
@table-sticky-scroll-bar-bg: fade(#000, 35%);
@table-sticky-scroll-bar-radius: 4px;

// Tag
// --
Expand Down Expand Up @@ -640,11 +652,14 @@
// Badge
// ---
@badge-height: 20px;
@badge-height-sm: 14px;
@badge-dot-size: 6px;
@badge-font-size: @font-size-sm;
@badge-font-size-sm: @font-size-sm;
@badge-font-weight: normal;
@badge-status-size: 6px;
@badge-text-color: @component-background;
@badge-color: @highlight-color;

// Rate
// ---
Expand All @@ -666,7 +681,7 @@
@card-inner-head-padding: 12px;
@card-padding-base: 24px;
@card-padding-base-sm: @card-padding-base / 2;
@card-actions-background: @background-color-light;
@card-actions-background: @component-background;
@card-actions-li-margin: 12px 0;
@card-skeleton-bg: #cfd8dc;
@card-background: @component-background;
Expand Down Expand Up @@ -736,6 +751,9 @@
@avatar-bg: #ccc;
@avatar-color: #fff;
@avatar-border-radius: @border-radius-base;
@avatar-group-overlapping: -8px;
@avatar-group-space: 3px;
@avatar-group-border-color: #fff;

// Switch
// ---
Expand All @@ -758,7 +776,7 @@
@pagination-item-bg: @component-background;
@pagination-item-size: @height-base;
@pagination-item-size-sm: 24px;
@pagination-font-family: Arial;
@pagination-font-family: @font-family;
@pagination-font-weight-active: 500;
@pagination-item-bg-active: @component-background;
@pagination-item-link-bg: @component-background;
Expand Down Expand Up @@ -977,5 +995,8 @@
// ---
@image-size-base: 48px;
@image-font-size-base: 24px;
@image-bg: #ccc;
@image-bg: #f5f5f5;
@image-color: #fff;
@image-preview-operation-size: 18px;
@image-preview-operation-color: @text-color-dark;
@image-preview-operation-disabled-color: fade(@image-preview-operation-color, 45%);

0 comments on commit b5f96ca

Please sign in to comment.