mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2024-11-27 04:09:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:TuSimple/naive-ui

Browse Source
This commit is contained in:
07akioni 2024-10-07 16:54:28 +08:00
commit 972638bd73
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.en-US.md
View File

@ -14,7 +14,7 @@
- `n-date-picker` adds `date-format` prop. - `n-date-picker` adds `date-format` prop.
- `n-progress`'s `color` prop supports gradient config. - `n-progress`'s `color` prop supports gradient config.
- `n-select` adds `font-weight` theme variable - `n-select` adds `font-weight` theme variable
- `n-input` adds `font-weight` theme variable
## 2.40.1 ## 2.40.1

1
CHANGELOG.zh-CN.md
View File

@ -14,6 +14,7 @@
- `n-date-picker` 新增 `date-format` 属性 - `n-date-picker` 新增 `date-format` 属性
- `n-progress` 的 `color` 属性支持渐变色配置 - `n-progress` 的 `color` 属性支持渐变色配置
- `n-select` 新增 `font-weight` 主题变量 - `n-select` 新增 `font-weight` 主题变量
- `n-input` 新增 `font-weight` 主题变量
## 2.40.1 ## 2.40.1

3
src/input/src/Input.tsx
View File

@ -904,7 +904,7 @@ export default defineComponent({
const cssVarsRef = computed(() => { const cssVarsRef = computed(() => {
const { value: size } = mergedSizeRef const { value: size } = mergedSizeRef
const { const {
common: { cubicBezierEaseInOut }, common: { cubicBezierEaseInOut, fontWeight },
self: { self: {
color, color,
borderRadius, borderRadius,
@ -961,6 +961,7 @@ export default defineComponent({
'--n-count-text-color-disabled': countTextColorDisabled, '--n-count-text-color-disabled': countTextColorDisabled,
'--n-color': color, '--n-color': color,
'--n-font-size': fontSize, '--n-font-size': fontSize,
'--n-font-weight': fontWeight,
'--n-border-radius': borderRadius, '--n-border-radius': borderRadius,
'--n-height': height, '--n-height': height,
'--n-padding-left': paddingLeft, '--n-padding-left': paddingLeft,

1
src/input/src/styles/input.cssr.ts
View File

@ -48,6 +48,7 @@ export default cB('input', `
background-color: var(--n-color); background-color: var(--n-color);
transition: background-color .3s var(--n-bezier); transition: background-color .3s var(--n-bezier);
font-size: var(--n-font-size); font-size: var(--n-font-size);
font-weight: var(--n-font-weight);
--n-padding-vertical: calc((var(--n-height) - 1.5 * var(--n-font-size)) / 2); --n-padding-vertical: calc((var(--n-height) - 1.5 * var(--n-font-size)) / 2);
`, [ `, [
// common // common