tntd 3.0.0-beta.1 → 3.0.0-beta.11

package/themes/common/css2.x.css

@@ -151,4 +151,39 @@
   --bg-color-spotilight-tint-50: var(--text-color-tint-50);
   --size-step-base: 4;
   --size-step-unit: 4;
+
+  --heading-1-size: calc(var(--font-size-base) * 2.71);
+  --heading-2-size: calc(var(--font-size-base) * 2.14);
+  --heading-3-size: calc(var(--font-size-base) * 1.71);
+  --heading-4-size: calc(var(--font-size-base) * 1.42);
+  --line-height-base: 1.5;
+  --line-height-sm: 1.6666666;
+  --line-height-lg: 1.5;
+  --line-height-xl: 28 / 20;
+  --heading-1-line-height: 40 / 32;
+  --heading-2-line-height: 32 / 24;
+  --heading-3-line-height: 26 / 18;
+  --heading-4-line-height: 24 / 16;
+  --border-radius-base: 2px;
+  --border-radius-sm: 2px;
+  --border-radius-xs: 4px;
+  --border-radius-lg: 20px;
+  --padding-xxs: 4px;
+  --padding-base: 16px;
+  --padding-xxl: 48px;
+  --padding-xl: 32px;
+  --padding-lg: 20px;
+  --padding-md: 12px;
+  --padding-sm: 10px;
+  --padding-xs: 8px;
+  --margin-xxs: 4px;
+  --margin-xs: 8px;
+  --margin-sm: 12px;
+  --margin-base: 16px;
+  --margin-md: 20px;
+  --margin-lg: 24px;
+  --margin-xl: 32px;
+  --margin-xxl: 48px;
+  --box-shadow-md: 0px 0px 20px 0px rgba(0, 0, 0, 0.05);
+  --box-shadow-lg: 0px 0px 25px 0px rgba(0, 0, 0, 0.1), 0px 0px 5px -5px rgba(0, 0, 0, 0.05);
 }

package/themes/common/css3.x.css

@@ -151,4 +151,39 @@
   --bg-color-spotilight-tint-50: var(--text-color-tint-50);
   --size-step-base: 4;
   --size-step-unit: 4;
+
+  --heading-1-size: 32px;
+  --heading-2-size: 24px;
+  --heading-3-size: 18px;
+  --heading-4-size: 16px;
+  --line-height-base: 22 / 14;
+  --line-height-sm: 20 / 12;
+  --line-height-lg: 24 / 16;
+  --line-height-xl: 28 / 20;
+  --heading-1-line-height: 40 / 32;
+  --heading-2-line-height: 32 / 24;
+  --heading-3-line-height: 26 / 18;
+  --heading-4-line-height: 24 / 16;
+  --border-radius-base: 8px;
+  --border-radius-sm: 4px;
+  --border-radius-xs: 2px;
+  --border-radius-lg: 16px;
+  --padding-xxs: 4px;
+  --padding-base: 16px;
+  --padding-xxl: 48px;
+  --padding-xl: 32px;
+  --padding-lg: 24px;
+  --padding-md: 20px;
+  --padding-sm: 12px;
+  --padding-xs: 8px;
+  --margin-xxs: 4px;
+  --margin-xs: 8px;
+  --margin-sm: 12px;
+  --margin-base: 16px;
+  --margin-md: 20px;
+  --margin-lg: 24px;
+  --margin-xl: 32px;
+  --margin-xxl: 48px;
+  --box-shadow-md: 0px 0px 20px 0px rgba(0, 0, 0, 0.05);
+  --box-shadow-lg: 0px 0px 25px 0px rgba(0, 0, 0, 0.1), 0px 0px 5px -5px rgba(0, 0, 0, 0.05);
 }

package/themes/default/colorsVar.less

@@ -19,7 +19,7 @@
 @grey-split: #e1e6ee; // 分割线 常用于表格、collapse
 
 // 背景色
-@bg-disabled: var(--fill-color-tertiary);
+@bg-disabled: #f1f2f5;
 @bg-grey-default: #f1f2f5;
 @bg-grey-first: #f8f9fb;
 @bg-grey-second: #f3f4f6;

package/themes/default/lessToCssVar.less

@@ -125,3 +125,42 @@
 @gold-10: var(--gold-10);
 @white: var(--white);
 @text-color: var(--text-color);
+
+/** 非颜色变量(这些变量暂时不用，直接用lessVars3.x.less) */
+// @font-size-base: var(--font-size-base);
+// @heading-1-size: var(--heading-1-size);
+// @heading-2-size: var(--heading-2-size);
+// @heading-3-size: var(--heading-3-size);
+// @heading-4-size: var(--heading-4-size);
+// @line-height-sm: var(--line-height-sm);
+// @line-height-lg: var(--line-height-lg);
+// @line-height-xl: var(--line-height-xl);
+// @heading-1-line-height: var(--heading-1-line-height);
+// @heading-2-line-height: var(--heading-2-line-height);
+// @heading-3-line-height: var(--heading-3-line-height);
+// @heading-4-line-height: var(--heading-4-line-height);
+@border-radius-base: var(--border-radius-base);
+@border-radius-sm: var(--border-radius-sm);
+@border-radius-xs: var(--border-radius-xs);
+@border-radius-lg: var(--border-radius-lg);
+// @padding-xxs: var(--padding-xxs);
+// @padding-base: var(--padding-base);
+// @padding-xxl: var(--padding-xxl);
+// @padding-xl: var(--padding-xl);
+// @padding-lg: var(--padding-lg);
+// @padding-md: var(--padding-md);
+// @margin-xxs: var(--margin-xxs);
+// @margin-xs: var(--margin-xs);
+// @margin-sm: var(--margin-sm);
+// @margin-base: var(--margin-base);
+// @margin-md: var(--margin-md);
+// @margin-lg: var(--margin-lg);
+// @margin-xl: var(--margin-xl);
+// @margin-xxl: var(--margin-xxl);
+// @box-shadow-md: var(--box-shadow-md);
+// @box-shadow-lg: var(--box-shadow-lg);
+
+/** 这几个变量涉及到计算，所以不能变成css变量  */
+@padding-sm: 12px;
+@padding-xs: 8px;
+@line-height-base: 22 / 14;

package/themes/default/lessVars2.x.less

@@ -10,10 +10,10 @@
 @heading-2-line-height: 32 / 24;
 @heading-3-line-height: 26 / 18;
 @heading-4-line-height: 24 / 16;
-@border-radius-base: 8px;
-@border-radius-sm: 2px;
-@border-radius-xs: 4px;
-@border-radius-lg: 20px;
+// @border-radius-base: 2px;
+// @border-radius-sm: 2px;
+// @border-radius-xs: 4px;
+// @border-radius-lg: 20px;
 @padding-xxs: 4px;
 @padding-base: 16px;
 @padding-xxl: 48px;

package/themes/default/lessVars3.x.less

@@ -32,5 +32,3 @@
 @margin-xxl: 48px;
 @box-shadow-md: 0px 0px 20px 0px rgba(0, 0, 0, 0.05);
 @box-shadow-lg: 0px 0px 25px 0px rgba(0, 0, 0, 0.1), 0px 0px 5px -5px rgba(0, 0, 0, 0.05);
-
-

package/themes/default/variables.less

@@ -247,7 +247,7 @@
 
 // Grid system
 @grid-columns: 24;
-@grid-gutter-width: 0;
+@grid-gutter-width: 0px;
 
 // Layout
 @layout-body-background: #f0f2f5;
@@ -412,7 +412,7 @@
 @table-header-color: @text-color; //@heading-color;
 @table-header-sort-bg: @background-color-base;
 @table-body-sort-bg: rgba(0, 0, 0, 0.01);
-@table-row-hover-bg: @primary-1;
+@table-row-hover-bg: #fff;
 @table-selected-row-color: inherit;
 @table-selected-row-bg: @primary-1;
 @table-expanded-row-bg: #fbfbfb;
@@ -522,7 +522,7 @@
 // ---
 @switch-height: 24px;
 @switch-sm-height: 20px;
-@switch-sm-checked-margin-left: -(@switch-sm-height - 3px);
+@switch-sm-checked-margin-left: 3px - @switch-sm-height;
 @switch-disabled-opacity: 0.4;
 @switch-color: @primary-color;
 @switch-shadow-color: fade(#00230b, 20%);

package/themes/default/variablesVar.less

@@ -1,7 +1,7 @@
 /* stylelint-disable at-rule-empty-line-before,at-rule-name-space-after,at-rule-no-unknown */
 @import './colorsVar.less';
-@import './lessToCssVar.less';
 @import './lessVars3.x.less';
+@import './lessToCssVar.less';
 
 // The prefix to use on all css classes from ant.
 @ant-prefix: ant;
@@ -48,7 +48,7 @@
   'Segoe UI Emoji', 'Segoe UI Symbol';
 @code-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
 @text-color: #17233d; //fade(@black, 65%);
-@text-color-secondary: var(--text-color-secondary); //fade(@black, 45%);
+@text-color-secondary: #454f64;
 @text-color-inverse: @white;
 @icon-color: inherit;
 @icon-color-hover: fade(@black, 75%);
@@ -248,7 +248,7 @@
 
 // Grid system
 @grid-columns: 24;
-@grid-gutter-width: 0;
+@grid-gutter-width: 0px;
 
 // Layout
 @layout-body-background: #f0f2f5;
@@ -413,7 +413,7 @@
 @table-header-color: @text-color; //@heading-color;
 @table-header-sort-bg: @background-color-base;
 @table-body-sort-bg: rgba(0, 0, 0, 0.01);
-@table-row-hover-bg: @primary-1;
+@table-row-hover-bg: #fff;
 @table-selected-row-color: inherit;
 @table-selected-row-bg: @primary-1;
 @table-expanded-row-bg: #fbfbfb;
@@ -523,7 +523,7 @@
 // ---
 @switch-height: 24px;
 @switch-sm-height: 20px;
-@switch-sm-checked-margin-left: -(@switch-sm-height - 3px);
+@switch-sm-checked-margin-left: 3px - @switch-sm-height;
 @switch-disabled-opacity: 0.4;
 @switch-color: @primary-color;
 @switch-shadow-color: fade(#00230b, 20%);
@@ -692,7 +692,7 @@
 @fill-color-tertiary: var(--fill-color-tertiary);
 @fill-color-quaternary: var(--fill-color-quaternary);
 @bg-color-quaternary: var(--bg-color-quaternary);
-@bg-color-spotilight: var(--bg-color-spotilight);
-@bg-color-spotilight-tint-50: var(--bg-color-spotilight-tint-50);
+@bg-color-spotilight: #17233d;
+@bg-color-spotilight-tint-50: #8b919e;
 @size-step-base: var(--size-step-base);
 @size-step-unit: var(--size-step-unit);