tntd 3.0.0-beta → 3.0.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (140) hide show
  1. package/es/breadcrumb/style/index.less +2 -1
  2. package/es/cascader/style/index.less +2 -2
  3. package/es/checkbox/checkbox-group.js +5 -0
  4. package/es/checkbox/checkbox-group.js.map +1 -0
  5. package/es/collapse/style/index.less +2 -1
  6. package/es/date-picker/style/Picker.less +2 -1
  7. package/es/drawer/drawer.less +20 -0
  8. package/es/drawer/style/drawer.less +4 -2
  9. package/es/dropdown/style/index.less +2 -1
  10. package/es/grid/RowContext.js +3 -0
  11. package/es/grid/RowContext.js.map +1 -0
  12. package/es/grid/col.js +103 -0
  13. package/es/grid/col.js.map +1 -0
  14. package/es/grid/hooks/useBreakpoint.js +18 -0
  15. package/es/grid/hooks/useBreakpoint.js.map +1 -0
  16. package/es/grid/row.js +154 -0
  17. package/es/grid/row.js.map +1 -0
  18. package/es/grid/style/rtl.less +69 -0
  19. package/es/icon/index.js +2 -3
  20. package/es/icon/index.js.map +1 -1
  21. package/es/icon/style/index.js +2 -1
  22. package/es/icon/style/index.js.map +1 -1
  23. package/es/icon/style/style.less +3 -1
  24. package/es/input/style/mixin.less +1 -1
  25. package/es/modal/modal.less +18 -0
  26. package/es/modal/style/confirm.less +1 -1
  27. package/es/modal/style/modal.less +5 -1
  28. package/es/notification/style/index.less +4 -2
  29. package/es/popconfirm/index.less +10 -4
  30. package/es/popconfirm/popconfirm.js +6 -3
  31. package/es/popconfirm/popconfirm.js.map +1 -1
  32. package/es/popover/index.less +6 -0
  33. package/es/popover/popover.js +4 -3
  34. package/es/popover/popover.js.map +1 -1
  35. package/es/popover/style/index.less +2 -1
  36. package/es/query-form/Field/Composition/Select.js +1 -1
  37. package/es/query-form/Field/Composition/Select.js.map +1 -1
  38. package/es/query-form/Field/Composition/index.js +4 -11
  39. package/es/query-form/Field/Composition/index.js.map +1 -1
  40. package/es/query-form/Field/Composition/index.less +3 -3
  41. package/es/radio/radio-group.js +5 -0
  42. package/es/radio/radio-group.js.map +1 -0
  43. package/es/select/style/index.less +2 -1
  44. package/es/steps/stepStyle/small.less +5 -0
  45. package/es/style/mixins/iconfont.less +3 -2
  46. package/es/style/themes/default.less +4 -3
  47. package/es/table/style/index.less +2 -4
  48. package/es/tag/tag.less +2 -1
  49. package/es/time-picker/style/index.less +2 -1
  50. package/es/timeline/style/index.less +1 -1
  51. package/es/tntd-action/index.less +17 -0
  52. package/es/tooltip/index.less +5 -0
  53. package/es/tooltip/tooltip.js +4 -3
  54. package/es/tooltip/tooltip.js.map +1 -1
  55. package/lib/breadcrumb/style/index.less +2 -1
  56. package/lib/cascader/style/index.less +2 -2
  57. package/lib/checkbox/checkbox-group.d.ts +8 -0
  58. package/lib/checkbox/checkbox-group.d.ts.map +1 -0
  59. package/lib/checkbox/checkbox-group.js +12 -0
  60. package/lib/checkbox/checkbox-group.js.map +1 -0
  61. package/lib/collapse/style/index.less +2 -1
  62. package/lib/date-picker/style/Picker.less +2 -1
  63. package/lib/drawer/drawer.less +20 -0
  64. package/lib/drawer/style/drawer.less +4 -2
  65. package/lib/dropdown/style/index.less +2 -1
  66. package/lib/grid/RowContext.d.ts +9 -0
  67. package/lib/grid/RowContext.d.ts.map +1 -0
  68. package/lib/grid/RowContext.js +9 -0
  69. package/lib/grid/RowContext.js.map +1 -0
  70. package/lib/grid/col.d.ts +29 -0
  71. package/lib/grid/col.d.ts.map +1 -0
  72. package/lib/grid/col.js +100 -0
  73. package/lib/grid/col.js.map +1 -0
  74. package/lib/grid/hooks/useBreakpoint.d.ts +4 -0
  75. package/lib/grid/hooks/useBreakpoint.d.ts.map +1 -0
  76. package/lib/grid/hooks/useBreakpoint.js +28 -0
  77. package/lib/grid/hooks/useBreakpoint.js.map +1 -0
  78. package/lib/grid/row.d.ts +21 -0
  79. package/lib/grid/row.d.ts.map +1 -0
  80. package/lib/grid/row.js +183 -0
  81. package/lib/grid/row.js.map +1 -0
  82. package/lib/grid/style/rtl.less +69 -0
  83. package/lib/icon/index.d.ts +1 -1
  84. package/lib/icon/index.d.ts.map +1 -1
  85. package/lib/icon/index.js +2 -2
  86. package/lib/icon/index.js.map +1 -1
  87. package/lib/icon/style/index.d.ts +1 -0
  88. package/lib/icon/style/index.d.ts.map +1 -1
  89. package/lib/icon/style/index.js +2 -1
  90. package/lib/icon/style/index.js.map +1 -1
  91. package/lib/icon/style/style.less +3 -1
  92. package/lib/input/style/mixin.less +1 -1
  93. package/lib/modal/modal.less +18 -0
  94. package/lib/modal/style/confirm.less +1 -1
  95. package/lib/modal/style/modal.less +5 -1
  96. package/lib/notification/style/index.less +4 -2
  97. package/lib/popconfirm/index.less +10 -4
  98. package/lib/popconfirm/popconfirm.d.ts +3 -1
  99. package/lib/popconfirm/popconfirm.d.ts.map +1 -1
  100. package/lib/popconfirm/popconfirm.js +5 -2
  101. package/lib/popconfirm/popconfirm.js.map +1 -1
  102. package/lib/popover/index.less +6 -0
  103. package/lib/popover/popover.d.ts +1 -0
  104. package/lib/popover/popover.d.ts.map +1 -1
  105. package/lib/popover/popover.js +4 -2
  106. package/lib/popover/popover.js.map +1 -1
  107. package/lib/popover/style/index.less +2 -1
  108. package/lib/query-form/Field/Composition/Select.js +2 -2
  109. package/lib/query-form/Field/Composition/Select.js.map +1 -1
  110. package/lib/query-form/Field/Composition/index.js +4 -11
  111. package/lib/query-form/Field/Composition/index.js.map +1 -1
  112. package/lib/query-form/Field/Composition/index.less +3 -3
  113. package/lib/radio/radio-group.d.ts +8 -0
  114. package/lib/radio/radio-group.d.ts.map +1 -0
  115. package/lib/radio/radio-group.js +12 -0
  116. package/lib/radio/radio-group.js.map +1 -0
  117. package/lib/select/style/index.less +2 -1
  118. package/lib/steps/stepStyle/small.less +5 -0
  119. package/lib/style/mixins/iconfont.less +3 -2
  120. package/lib/style/themes/default.less +4 -3
  121. package/lib/table/style/index.less +2 -4
  122. package/lib/tag/tag.less +2 -1
  123. package/lib/time-picker/style/index.less +2 -1
  124. package/lib/timeline/style/index.less +1 -1
  125. package/lib/tntd-action/index.less +17 -0
  126. package/lib/tooltip/index.less +5 -0
  127. package/lib/tooltip/tooltip.d.ts +1 -0
  128. package/lib/tooltip/tooltip.d.ts.map +1 -1
  129. package/lib/tooltip/tooltip.js +4 -2
  130. package/lib/tooltip/tooltip.js.map +1 -1
  131. package/package.json +1 -2
  132. package/themes/common/css2.x.css +35 -1
  133. package/themes/common/css3.x.css +35 -1
  134. package/themes/default/colors.less +4 -4
  135. package/themes/default/colorsVar.less +3 -3
  136. package/themes/default/lessToCssVar.less +39 -0
  137. package/themes/default/lessVars2.x.less +4 -4
  138. package/themes/default/lessVars3.x.less +4 -4
  139. package/themes/default/variables.less +5 -4
  140. package/themes/default/variablesVar.less +63 -38
@@ -33,11 +33,12 @@
33
33
  display: inline-block;
34
34
  @font-scale: unit(@size / 12px);
35
35
 
36
- font-size: 12px;
36
+ font-size: 16px;
37
37
  // IE9
38
38
  font-size: ~'@{size} \9';
39
39
  transform: scale(@font-scale) rotate(@rotate);
40
40
  :root & {
41
- font-size: @font-size-sm; // reset IE9 and above
41
+ // font-size: @font-size-sm; // reset IE9 and above
42
+ font-size: 16px; // reset IE9 and above
42
43
  }
43
44
  }
@@ -419,7 +419,8 @@
419
419
  @menu-item-active-bg: @item-active-bg;
420
420
  @menu-item-active-border-width: 3px;
421
421
  @menu-item-group-title-color: @text-color-secondary;
422
- @menu-icon-size: @font-size-base;
422
+ // @menu-icon-size: @font-size-base;
423
+ @menu-icon-size: 16px;
423
424
  @menu-icon-size-lg: @font-size-lg;
424
425
 
425
426
  @menu-item-vertical-margin: 4px;
@@ -448,7 +449,7 @@
448
449
  @table-header-color: @heading-color;
449
450
  @table-header-sort-bg: @background-color-base;
450
451
  @table-body-sort-bg: rgba(0, 0, 0, 0.01);
451
- @table-row-hover-bg: @primary-1;
452
+ @table-row-hover-bg: #fff;
452
453
  @table-selected-row-color: inherit;
453
454
  @table-selected-row-bg: #fafafa;
454
455
  @table-body-selected-sort-bg: @table-selected-row-bg;
@@ -562,7 +563,7 @@
562
563
  // ---
563
564
  @switch-height: 22px;
564
565
  @switch-sm-height: 16px;
565
- @switch-sm-checked-margin-left: calc(-(@switch-sm-height - 3px));
566
+ @switch-sm-checked-margin-left: calc(3px - @switch-sm-height);
566
567
  @switch-disabled-opacity: 0.4;
567
568
  @switch-color: @primary-color;
568
569
  @switch-shadow-color: fade(#00230b, 20%);
@@ -237,8 +237,7 @@
237
237
  box-shadow: 0px 0px 5px -5px rgba(0, 0, 0, 0.05), 0px 0px 25px 0px rgba(0, 0, 0, 0.1);
238
238
  position: relative;
239
239
  > td {
240
- // background: @table-row-hover-bg;
241
- background-color: #fff;
240
+ background: @table-row-hover-bg;
242
241
  }
243
242
  }
244
243
  }
@@ -253,8 +252,7 @@
253
252
  // box-shadow: 0px 0px 5px -5px rgba(0, 0, 0, 0.05), 0px 0px 25px 0px rgba(0, 0, 0, 0.1);
254
253
  // position: relative;
255
254
  // > td {
256
- // // background: @table-row-hover-bg;
257
- // background-color: #fff;
255
+ // background: @table-row-hover-bg;
258
256
  // }
259
257
  // }
260
258
  // }
package/lib/tag/tag.less CHANGED
@@ -124,7 +124,8 @@
124
124
  background: @@lightColor;
125
125
  border-color: @@lightBorderColor;
126
126
  >.@{iconfont-css-prefix}-close {
127
- color: fade(@@darkColor,80%);
127
+ color: @@darkColor;//fade(@@darkColor,80%);
128
+ opacity: .8;
128
129
  }
129
130
  &.@{tag-prefix-cls}-no-border{
130
131
  border-color:transparent;
@@ -194,7 +194,8 @@
194
194
  z-index: 1;
195
195
  width: 14px;
196
196
  height: 14px;
197
- margin-top: -7px;
197
+ // margin-top: -7px;
198
+ margin-top: -8px;
198
199
  color: @disabled-color;
199
200
  line-height: 14px;
200
201
  transition: all 0.3s @ease-in-out;
@@ -80,7 +80,7 @@
80
80
 
81
81
  &-content {
82
82
  position: relative;
83
- top: calc(-(@font-size-base * @line-height-base - @font-size-base) + 1px);
83
+ top: calc(@font-size-base - @font-size-base * @line-height-base + 1px);
84
84
  margin: 0 0 0 18px;
85
85
  word-break: break-word;
86
86
  }
@@ -11,6 +11,17 @@
11
11
  color: @white;
12
12
  margin-left: 20px;
13
13
  font-size: 14px;
14
+ .num {
15
+ display: inline-block;
16
+ width: 16px;
17
+ height: 16px;
18
+ background: #454f64;
19
+ border-radius: 8px;
20
+ font-size: 10px;
21
+ margin-right: 4px;
22
+ vertical-align: text-bottom;
23
+ text-align: center;
24
+ }
14
25
  }
15
26
  > .tnt-btn-tertiary {
16
27
  opacity: 0.5;
@@ -31,6 +42,12 @@
31
42
  float: right;
32
43
  .ant-btn {
33
44
  margin-left: 10px;
45
+ background: rgba(69, 79, 100, 0.5);
46
+ color: @white;
47
+ border-width: 0;
48
+ &:hover {
49
+ background: rgba(69, 79, 100, 0.8);
50
+ }
34
51
  }
35
52
  }
36
53
  }
@@ -20,5 +20,10 @@
20
20
  &-arrow {
21
21
  border-radius: 1px;
22
22
  }
23
+ }
23
24
 
25
+ .@{tooltip-prefix-cls}-arrow-hidden {
26
+ .@{tooltip-prefix-cls}-arrow {
27
+ display: none;
28
+ }
24
29
  }
@@ -3,6 +3,7 @@ import type { TooltipProps } from 'antd/lib/tooltip';
3
3
  export * from 'antd/lib/tooltip';
4
4
  declare const Tooltip: React.FC<TooltipProps & {
5
5
  theme?: string;
6
+ hiddenArrow?: boolean;
6
7
  }>;
7
8
  export default Tooltip;
8
9
  //# sourceMappingURL=tooltip.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"tooltip.d.ts","sourceRoot":"","sources":["../../src/tooltip/tooltip.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAKnD,cAAc,iBAAiB,CAAA;AAK/B,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAsBxD,CAAA;AAED,eAAe,OAAO,CAAA"}
1
+ {"version":3,"file":"tooltip.d.ts","sourceRoot":"","sources":["../../src/tooltip/tooltip.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAKnD,cAAc,iBAAiB,CAAA;AAK/B,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,CAuB/E,CAAA;AAED,eAAe,OAAO,CAAA"}
@@ -39,12 +39,14 @@ var Tooltip = function Tooltip(props) {
39
39
  var overlayClassName = props.overlayClassName,
40
40
  _props$theme = props.theme,
41
41
  theme = _props$theme === void 0 ? '' : _props$theme,
42
- restProps = __rest(props, ["overlayClassName", "theme"]);
42
+ _props$hiddenArrow = props.hiddenArrow,
43
+ hiddenArrow = _props$hiddenArrow === void 0 ? false : _props$hiddenArrow,
44
+ restProps = __rest(props, ["overlayClassName", "theme", "hiddenArrow"]);
43
45
  return _react["default"].createElement(_configProvider.ConfigConsumer, null, function (_ref) {
44
46
  var getPrefixCls = _ref.getPrefixCls;
45
47
  var prefixCls = getPrefixCls('tooltip');
46
48
  return _react["default"].createElement(_tooltip["default"], Object.assign({
47
- overlayClassName: (0, _classnames["default"])(prefixCls, 'tnt-tooltip', themeMap(prefixCls, theme), overlayClassName)
49
+ overlayClassName: (0, _classnames["default"])(prefixCls, 'tnt-tooltip', themeMap(prefixCls, theme), hiddenArrow ? prefixCls + '-arrow-hidden' : '', overlayClassName)
48
50
  }, restProps));
49
51
  });
50
52
  };
@@ -1 +1 @@
1
- {"version":3,"file":"tooltip.js","sourceRoot":"","sources":["../../src/tooltip/tooltip.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,6DAAwD;AACxD,8DAAyC;AACzC,4DAAmC;AAEnC,kDAA+B;AAC/B,MAAM,QAAQ,GAAG,CAAC,SAAiB,EAAE,UAAkB,EAAE,EAAE;IACzD,OAAO,GAAG,SAAS,IAAI,UAAU,EAAE,CAAA;AACrC,CAAC,CAAA;AAED,MAAM,OAAO,GAAgD,CAAC,KAAK,EAAE,EAAE;IACrE,MAAM,EAAE,gBAAgB,EAAE,KAAK,GAAG,EAAE,KAAmB,KAAK,EAAnB,SAAS,UAAK,KAAK,EAAtD,6BAA8C,CAAQ,CAAA;IAE5D,OAAO,CACL,8BAAC,gCAAc,QACZ,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,CAAA;QAEzC,OAAO,CACL,8BAAC,iBAAW,kBACV,gBAAgB,EAAE,IAAA,oBAAU,EAC1B,SAAS,EACT,aAAa,EACb,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,EAC1B,gBAAgB,CACjB,IACG,SAAS,EACb,CACH,CAAA;IACH,CAAC,CACc,CAClB,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,OAAO,CAAA","sourcesContent":["import React from 'react'\nimport type { TooltipProps } from 'antd/lib/tooltip'\nimport { ConfigConsumer } from 'antd/lib/config-provider'\nimport AntdTooltip from 'antd/lib/tooltip'\nimport classNames from 'classnames'\n\nexport * from 'antd/lib/tooltip'\nconst themeMap = (prefixCls: string, themeColor: string) => {\n return `${prefixCls}-${themeColor}`\n}\n\nconst Tooltip: React.FC<TooltipProps & { theme?: string }> = (props) => {\n const { overlayClassName, theme = '', ...restProps } = props\n\n return (\n <ConfigConsumer>\n {({ getPrefixCls }) => {\n const prefixCls = getPrefixCls('tooltip')\n\n return (\n <AntdTooltip\n overlayClassName={classNames(\n prefixCls,\n 'tnt-tooltip',\n themeMap(prefixCls, theme),\n overlayClassName\n )}\n {...restProps}\n />\n )\n }}\n </ConfigConsumer>\n )\n}\n\nexport default Tooltip\n"]}
1
+ {"version":3,"file":"tooltip.js","sourceRoot":"","sources":["../../src/tooltip/tooltip.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAyB;AAEzB,6DAAwD;AACxD,8DAAyC;AACzC,4DAAmC;AAEnC,kDAA+B;AAC/B,MAAM,QAAQ,GAAG,CAAC,SAAiB,EAAE,UAAkB,EAAE,EAAE;IACzD,OAAO,GAAG,SAAS,IAAI,UAAU,EAAE,CAAA;AACrC,CAAC,CAAA;AAED,MAAM,OAAO,GAAuE,CAAC,KAAK,EAAE,EAAE;IAC5F,MAAM,EAAE,gBAAgB,EAAE,KAAK,GAAG,EAAE,EAAE,WAAW,GAAG,KAAK,KAAmB,KAAK,EAAnB,SAAS,UAAK,KAAK,EAA3E,4CAAmE,CAAQ,CAAA;IAEjF,OAAO,CACL,8BAAC,gCAAc,QACZ,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;QACpB,MAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC,CAAA;QAEzC,OAAO,CACL,8BAAC,iBAAW,kBACV,gBAAgB,EAAE,IAAA,oBAAU,EAC1B,SAAS,EACT,aAAa,EACb,QAAQ,CAAC,SAAS,EAAE,KAAK,CAAC,EAC1B,WAAW,CAAC,CAAC,CAAC,SAAS,GAAG,eAAe,CAAC,CAAC,CAAC,EAAE,EAC9C,gBAAgB,CACjB,IACG,SAAS,EACb,CACH,CAAA;IACH,CAAC,CACc,CAClB,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,OAAO,CAAA","sourcesContent":["import React from 'react'\nimport type { TooltipProps } from 'antd/lib/tooltip'\nimport { ConfigConsumer } from 'antd/lib/config-provider'\nimport AntdTooltip from 'antd/lib/tooltip'\nimport classNames from 'classnames'\n\nexport * from 'antd/lib/tooltip'\nconst themeMap = (prefixCls: string, themeColor: string) => {\n return `${prefixCls}-${themeColor}`\n}\n\nconst Tooltip: React.FC<TooltipProps & { theme?: string; hiddenArrow?: boolean }> = (props) => {\n const { overlayClassName, theme = '', hiddenArrow = false, ...restProps } = props\n\n return (\n <ConfigConsumer>\n {({ getPrefixCls }) => {\n const prefixCls = getPrefixCls('tooltip')\n\n return (\n <AntdTooltip\n overlayClassName={classNames(\n prefixCls,\n 'tnt-tooltip',\n themeMap(prefixCls, theme),\n hiddenArrow ? prefixCls + '-arrow-hidden' : '',\n overlayClassName\n )}\n {...restProps}\n />\n )\n }}\n </ConfigConsumer>\n )\n}\n\nexport default Tooltip\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "tntd",
3
- "version": "3.0.0-beta",
3
+ "version": "3.0.0-beta.2",
4
4
  "license": "MIT",
5
5
  "scripts": {
6
6
  "start": "heft start --storybook",
@@ -15,7 +15,6 @@
15
15
  "test:watch": "heft test --watch --clean"
16
16
  },
17
17
  "dependencies": {
18
- "@icon-park/react": "^1.3.5",
19
18
  "@stellaris/hooks": "~0.4.6",
20
19
  "classnames": "~2.3.1",
21
20
  "@tntx/logo-icon": "~1.0.4",
@@ -142,7 +142,6 @@
142
142
  --text-color-secondary: #454f64;
143
143
  --text-color-tint-50: #8b919e;
144
144
  --text-color-tertiary: #babdc5;
145
- --fill-color-tertiary: #f1f2f5;
146
145
  --fill-color-quaternary: #f8f9fb;
147
146
  --border-color: #c9d2dd;
148
147
  --border-color-secondary: #e1e6ee;
@@ -151,4 +150,39 @@
151
150
  --bg-color-spotilight-tint-50: var(--text-color-tint-50);
152
151
  --size-step-base: 4;
153
152
  --size-step-unit: 4;
153
+
154
+ --heading-1-size: calc(var(--font-size-base) * 2.71);
155
+ --heading-2-size: calc(var(--font-size-base) * 2.14);
156
+ --heading-3-size: calc(var(--font-size-base) * 1.71);
157
+ --heading-4-size: calc(var(--font-size-base) * 1.42);
158
+ --line-height-base: 1.5;
159
+ --line-height-sm: 1.6666666;
160
+ --line-height-lg: 1.5;
161
+ --line-height-xl: 28 / 20;
162
+ --heading-1-line-height: 40 / 32;
163
+ --heading-2-line-height: 32 / 24;
164
+ --heading-3-line-height: 26 / 18;
165
+ --heading-4-line-height: 24 / 16;
166
+ --border-radius-base: 2px;
167
+ --border-radius-sm: 2px;
168
+ --border-radius-xs: 4px;
169
+ --border-radius-lg: 20px;
170
+ --padding-xxs: 4px;
171
+ --padding-base: 16px;
172
+ --padding-xxl: 48px;
173
+ --padding-xl: 32px;
174
+ --padding-lg: 20px;
175
+ --padding-md: 12px;
176
+ --padding-sm: 10px;
177
+ --padding-xs: 8px;
178
+ --margin-xxs: 4px;
179
+ --margin-xs: 8px;
180
+ --margin-sm: 12px;
181
+ --margin-base: 16px;
182
+ --margin-md: 20px;
183
+ --margin-lg: 24px;
184
+ --margin-xl: 32px;
185
+ --margin-xxl: 48px;
186
+ --box-shadow-md: 0px 0px 20px 0px rgba(0, 0, 0, 0.05);
187
+ --box-shadow-lg: 0px 0px 25px 0px rgba(0, 0, 0, 0.1), 0px 0px 5px -5px rgba(0, 0, 0, 0.05);
154
188
  }
@@ -142,7 +142,6 @@
142
142
  --text-color-secondary: #454f64;
143
143
  --text-color-tint-50: #8b919e;
144
144
  --text-color-tertiary: #babdc5;
145
- --fill-color-tertiary: #f1f2f5;
146
145
  --fill-color-quaternary: #f8f9fb;
147
146
  --border-color: #c9d2dd;
148
147
  --border-color-secondary: #e1e6ee;
@@ -151,4 +150,39 @@
151
150
  --bg-color-spotilight-tint-50: var(--text-color-tint-50);
152
151
  --size-step-base: 4;
153
152
  --size-step-unit: 4;
153
+
154
+ --heading-1-size: 32px;
155
+ --heading-2-size: 24px;
156
+ --heading-3-size: 18px;
157
+ --heading-4-size: 16px;
158
+ --line-height-base: 22 / 14;
159
+ --line-height-sm: 20 / 12;
160
+ --line-height-lg: 24 / 16;
161
+ --line-height-xl: 28 / 20;
162
+ --heading-1-line-height: 40 / 32;
163
+ --heading-2-line-height: 32 / 24;
164
+ --heading-3-line-height: 26 / 18;
165
+ --heading-4-line-height: 24 / 16;
166
+ --border-radius-base: 8px;
167
+ --border-radius-sm: 4px;
168
+ --border-radius-xs: 2px;
169
+ --border-radius-lg: 16px;
170
+ --padding-xxs: 4px;
171
+ --padding-base: 16px;
172
+ --padding-xxl: 48px;
173
+ --padding-xl: 32px;
174
+ --padding-lg: 24px;
175
+ --padding-md: 20px;
176
+ --padding-sm: 12px;
177
+ --padding-xs: 8px;
178
+ --margin-xxs: 4px;
179
+ --margin-xs: 8px;
180
+ --margin-sm: 12px;
181
+ --margin-base: 16px;
182
+ --margin-md: 20px;
183
+ --margin-lg: 24px;
184
+ --margin-xl: 32px;
185
+ --margin-xxl: 48px;
186
+ --box-shadow-md: 0px 0px 20px 0px rgba(0, 0, 0, 0.05);
187
+ --box-shadow-lg: 0px 0px 25px 0px rgba(0, 0, 0, 0.1), 0px 0px 5px -5px rgba(0, 0, 0, 0.05);
154
188
  }
@@ -1,18 +1,18 @@
1
1
  @import '../utils/colorPalette';
2
- @blue-6-hover: #005df4;
2
+ @blue-6-hover: #3b8cff;
3
3
  @blue-6: #126bfb;
4
4
  @purple-6: #722ed1;
5
5
  @cyan-6: #13c2c2;
6
- @green-6: #56bb52;
6
+ @green-6: #07c790;
7
7
  @magenta-6: #eb2f96;
8
8
  @pink-6: #eb2f96;
9
- @red-6: #d96156;
9
+ @red-6: #ef4444;
10
10
  @orange-6: #fa8c16;
11
11
  @yellow-6: #fadb14;
12
12
  @volcano-6: #fa541c;
13
13
  @geekblue-6: #2f54eb;
14
14
  @lime-6: #a0d911;
15
- @gold-6: #ff9845;
15
+ @gold-6: #f7b035;
16
16
 
17
17
  // 线条显色
18
18
  @grey-d: #c9d2dd;
@@ -1,5 +1,5 @@
1
1
  @import '../utils/colorPalette';
2
- @blue-6-hover: #005df4;
2
+ @blue-6-hover: var(--blue-5);
3
3
  @blue-6: var(--blue-6); // #126bfb;
4
4
  @purple-6: var(--purple-6); // #722ed1;
5
5
  @cyan-6: var(--cyan-6); //#13c2c2;
@@ -19,9 +19,9 @@
19
19
  @grey-split: #e1e6ee; // 分割线 常用于表格、collapse
20
20
 
21
21
  // 背景色
22
- @bg-disabled: var(--fill-color-tertiary);
22
+ @bg-disabled: #f1f2f5;
23
23
  @bg-grey-default: #f1f2f5;
24
- @bg-grey-first: #fafafa;
24
+ @bg-grey-first: #f8f9fb;
25
25
  @bg-grey-second: #f3f4f6;
26
26
 
27
27
  // color palettes
@@ -125,3 +125,42 @@
125
125
  @gold-10: var(--gold-10);
126
126
  @white: var(--white);
127
127
  @text-color: var(--text-color);
128
+
129
+ /** 非颜色变量(这些变量暂时不用,直接用lessVars3.x.less) */
130
+ // @font-size-base: var(--font-size-base);
131
+ // @heading-1-size: var(--heading-1-size);
132
+ // @heading-2-size: var(--heading-2-size);
133
+ // @heading-3-size: var(--heading-3-size);
134
+ // @heading-4-size: var(--heading-4-size);
135
+ // @line-height-sm: var(--line-height-sm);
136
+ // @line-height-lg: var(--line-height-lg);
137
+ // @line-height-xl: var(--line-height-xl);
138
+ // @heading-1-line-height: var(--heading-1-line-height);
139
+ // @heading-2-line-height: var(--heading-2-line-height);
140
+ // @heading-3-line-height: var(--heading-3-line-height);
141
+ // @heading-4-line-height: var(--heading-4-line-height);
142
+ @border-radius-base: var(--border-radius-base);
143
+ @border-radius-sm: var(--border-radius-sm);
144
+ @border-radius-xs: var(--border-radius-xs);
145
+ @border-radius-lg: var(--border-radius-lg);
146
+ // @padding-xxs: var(--padding-xxs);
147
+ // @padding-base: var(--padding-base);
148
+ // @padding-xxl: var(--padding-xxl);
149
+ // @padding-xl: var(--padding-xl);
150
+ // @padding-lg: var(--padding-lg);
151
+ // @padding-md: var(--padding-md);
152
+ // @margin-xxs: var(--margin-xxs);
153
+ // @margin-xs: var(--margin-xs);
154
+ // @margin-sm: var(--margin-sm);
155
+ // @margin-base: var(--margin-base);
156
+ // @margin-md: var(--margin-md);
157
+ // @margin-lg: var(--margin-lg);
158
+ // @margin-xl: var(--margin-xl);
159
+ // @margin-xxl: var(--margin-xxl);
160
+ // @box-shadow-md: var(--box-shadow-md);
161
+ // @box-shadow-lg: var(--box-shadow-lg);
162
+
163
+ /** 这几个变量涉及到计算,所以不能变成css变量 */
164
+ @padding-sm: 12px;
165
+ @padding-xs: 8px;
166
+ @line-height-base: 22 / 14;
@@ -10,10 +10,10 @@
10
10
  @heading-2-line-height: 32 / 24;
11
11
  @heading-3-line-height: 26 / 18;
12
12
  @heading-4-line-height: 24 / 16;
13
- @border-radius-base: 8px;
14
- @border-radius-sm: 2px;
15
- @border-radius-xs: 4px;
16
- @border-radius-lg: 20px;
13
+ // @border-radius-base: 2px;
14
+ // @border-radius-sm: 2px;
15
+ // @border-radius-xs: 4px;
16
+ // @border-radius-lg: 20px;
17
17
  @padding-xxs: 4px;
18
18
  @padding-base: 16px;
19
19
  @padding-xxl: 48px;
@@ -10,10 +10,10 @@
10
10
  @heading-2-line-height: 32 / 24;
11
11
  @heading-3-line-height: 26 / 18;
12
12
  @heading-4-line-height: 24 / 16;
13
- @border-radius-base: 8px;
14
- @border-radius-sm: 4px;
15
- @border-radius-xs: 2px;
16
- @border-radius-lg: 16px;
13
+ // @border-radius-base: 8px;
14
+ // @border-radius-sm: 4px;
15
+ // @border-radius-xs: 2px;
16
+ // @border-radius-lg: 16px;
17
17
  @padding-xxs: 4px;
18
18
  @padding-base: 16px;
19
19
  @padding-xxl: 48px;
@@ -1,6 +1,6 @@
1
1
  /* stylelint-disable at-rule-empty-line-before,at-rule-name-space-after,at-rule-no-unknown */
2
- @import './colors';
3
- @import './lessVars2.x.less';
2
+ @import './colors.less';
3
+ @import './lessVars3.x.less';
4
4
 
5
5
  // The prefix to use on all css classes from ant.
6
6
  @ant-prefix: ant;
@@ -47,7 +47,7 @@
47
47
  'Segoe UI Emoji', 'Segoe UI Symbol';
48
48
  @code-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
49
49
  @text-color: #17233d; //fade(@black, 65%);
50
- @text-color-secondary: var(--text-color-secondary); //fade(@black, 45%);
50
+ @text-color-secondary: #454f64; //fade(@black, 45%);
51
51
  @text-color-inverse: @white;
52
52
  @icon-color: inherit;
53
53
  @icon-color-hover: fade(@black, 75%);
@@ -412,7 +412,7 @@
412
412
  @table-header-color: @text-color; //@heading-color;
413
413
  @table-header-sort-bg: @background-color-base;
414
414
  @table-body-sort-bg: rgba(0, 0, 0, 0.01);
415
- @table-row-hover-bg: @primary-1;
415
+ @table-row-hover-bg: #fff;
416
416
  @table-selected-row-color: inherit;
417
417
  @table-selected-row-bg: @primary-1;
418
418
  @table-expanded-row-bg: #fbfbfb;
@@ -692,5 +692,6 @@
692
692
  @fill-color-quaternary: #f8f9fb;
693
693
  @bg-color-quaternary: #f8f9fb;
694
694
  @bg-color-spotilight: #17233d;
695
+ @bg-color-spotilight-tint-50: #8b919e;
695
696
  @size-step-base: 4;
696
697
  @size-step-unit: 4;