diff --git a/src/input-number/src/styles/themed-base.cssr.js b/src/input-number/src/styles/themed-base.cssr.js index 5d57c4e60..d7a525832 100644 --- a/src/input-number/src/styles/themed-base.cssr.js +++ b/src/input-number/src/styles/themed-base.cssr.js @@ -279,8 +279,9 @@ export default c([ }, ({ props }) => ['warning', 'error'].map(status => { const local = props.$local - const boxShadow = local[createKey('boxShadow', status)] + const border = local[createKey('border', status)] const borderHover = local[createKey('borderHover', status)] + const borderFocus = local[createKey('borderFocus', status)] const boxShadowFocus = local[createKey('boxShadowFocus', status)] const colorFocus = local[createKey('colorFocus', status)] const caretColor = local[createKey('caretColor', status)] @@ -290,7 +291,7 @@ export default c([ status, cTB('input-number', [ cE('border-mask', { - boxShadow: boxShadow + border }), cE('input', { caretColor: caretColor @@ -305,6 +306,7 @@ export default c([ }, [ c('& ~', [ cE('border-mask', { + border: borderFocus, boxShadow: boxShadowFocus }) ]) diff --git a/src/input-number/styles/dark.js b/src/input-number/styles/dark.js index e26d80e9a..13828b426 100644 --- a/src/input-number/styles/dark.js +++ b/src/input-number/styles/dark.js @@ -64,16 +64,18 @@ export default create({ boxShadowFocus: `0 0 8px 0 ${changeColor(primaryColor, { alpha: 0.3 })}`, placeholdeColor, // warning - borderWarning: `inset 0 0 0 1px ${warningColor}`, - borderHoverWarning: `inset 0 0 0 1px ${warningColorHover}`, + borderWarning: `1px solid ${warningColor}`, + borderHoverWarning: `1px solid ${warningColorHover}`, + borderFocusWarning: `1px solid ${warningColorHover}`, boxShadowFocusWarning: `0 0 8px 0 ${changeColor(warningColor, { alpha: 0.2 })}`, colorFocusWarning: changeColor(warningColor, { alpha: 0.1 }), caretColorWarning: warningColorHover, buttonTextColorHoverWarning: warningColorHover, buttonTextColorPressedWarning: warningColorPressed, // error - borderError: `inset 0 0 0 1px ${errorColor}`, - borderHoverError: `inset 0 0 0 1px ${errorColorHover}`, + borderError: `1px solid ${errorColor}`, + borderHoverError: `1px solid ${errorColorHover}`, + borderFocusError: `1px solid ${errorColorHover}`, boxShadowFocusError: `0 0 8px 0 ${changeColor(errorColor, { alpha: 0.2 })}`, colorFocusError: changeColor(errorColor, { alpha: 0.1 }), caretColorError: errorColorHover, diff --git a/src/input-number/styles/light.js b/src/input-number/styles/light.js index ec4111a8b..2ec733706 100644 --- a/src/input-number/styles/light.js +++ b/src/input-number/styles/light.js @@ -64,8 +64,9 @@ export default create({ boxShadowFocus: `0 0 0 2px ${changeColor(primaryColor, { alpha: 0.2 })}`, placeholderColor, // warning - boxShadowWarning: `inset 0 0 0 1px ${warningColor}`, + borderWarning: `1px solid ${warningColor}`, borderHoverWarning: `1px solid ${warningColorHover}`, + borderFocusWarning: `1px solid ${warningColorHover}`, boxShadowFocusWarning: `0 0 0 2px ${changeColor(warningColor, { alpha: 0.2 })}`, colorFocusWarning: colorFocus, caretColorWarning: warningColorHover, @@ -74,6 +75,7 @@ export default create({ // error borderError: `1px solid ${errorColor}`, borderHoverError: `1px solid ${errorColorHover}`, + borderFocusError: `1px solid ${errorColorHover}`, boxShadowFocusError: `0 0 0 2px ${changeColor(errorColor, { alpha: 0.2 })}`, colorFocusError: colorFocus, caretColorError: errorColorHover,