javascript/element-plus
1
0
Fork 0
mirror of https://github.com/element-plus/element-plus.git synced 2026-03-13 07:51:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(components): [el-date-picker] fix range-picker border (#6230)

Browse Source
This commit is contained in:
msidolphin
2022-02-23 10:08:19 +08:00
committed by GitHub
parent 00c855d927
commit d05a83b9e7
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/theme-chalk/src/common/var.scss
View File

@@ -461,9 +461,9 @@ $input: () !default;
$input: map.merge(
(
'text-color': var(--el-text-color-regular),
'border': 0 0 0 1px var(--el-input-border-color) inset,
'hover-border': 0 0 0 1px var(--el-input-hover-border-color) inset,
'focus-border': 0 0 0 1px var(--el-input-focus-border-color) inset,
'border': var(--el-border-base),
'hover-border': var(--el-border-color-hover),
'focus-border': var(--el-color-primary),
'transparent-border': 0 0 0 1px transparent inset,
'border-color': var(--el-border-color-base),
'border-radius': var(--el-border-radius-base),

7
packages/theme-chalk/src/date-picker/picker.scss
View File

@@ -18,7 +18,7 @@
@include b(date-editor) {
@include set-component-css-var('date-editor', $date-editor);
@include set-component-css-var('input', $input);
position: relative;
display: inline-block;
text-align: left;
@@ -144,10 +144,9 @@
}
@include when(active) {
border-color: var(--el-color-primary);
@include inset-input-border(var(--el-input-focus-border-color));
&:hover {
border-color: var(--el-color-primary);
@include inset-input-border(var(--el-input-focus-border-color));
}
}

16
packages/theme-chalk/src/input.scss
View File

@@ -52,7 +52,9 @@
color: var(--el-input-text-color, map.get($input, 'text-color'));
background-color: var(--el-input-bg-color, map.get($input, 'bg-color'));
background-image: none;
box-shadow: var(--el-input-border, map.get($input, 'border'));
@include inset-input-border(
var(--el-input-border-color, map.get($input, 'border-color'))
);
border-radius: var(
--el-input-border-radius,
map.get($input, 'border-radius')
@@ -67,12 +69,12 @@
}
&:hover {
box-shadow: var(--el-input-hover-border);
@include inset-input-border(var(--el-input-hover-border-color));
}
&:focus {
outline: none;
box-shadow: var(--el-input-focus-border);
@include inset-input-border(var(--el-input-focus-border-color));
}
}
@@ -166,7 +168,9 @@
padding: 0 map.get($input-padding-horizontal, 'default')-$border-width-base;
transition: var(--el-transition-box-shadow);
width: 100%;
box-shadow: var(--el-input-border, map.get($input, 'border'));
@include inset-input-border(
var(--el-input-border-color, map.get($input, 'border-color'))
);
&::placeholder {
color: var(
@@ -176,12 +180,12 @@
}
&:hover {
box-shadow: var(--el-input-hover-border);
@include inset-input-border(var(--el-input-hover-border-color));
}
&:focus {
outline: none;
box-shadow: var(--el-input-focus-border);
@include inset-input-border(var(--el-input-focus-border-color));
}
}