mirror of
https://github.com/tusen-ai/naive-ui.git
synced 2024-12-21 04:50:14 +08:00
fix(back-top, breadcrumb, form, input, message): fix style problems derived from style migration
This commit is contained in:
parent
30468e95bb
commit
c7916682e3
@ -1,5 +1,5 @@
|
||||
import { c, cB, cTB, cM } from '../../../_utils/cssr'
|
||||
import fadeInScaleIpTransition from '../../../styles/_transitions/fade-in-scale-up'
|
||||
import fadeInScaleIpTransition from '../../../_styles/transitions/fade-in-scale-up'
|
||||
|
||||
export default c([
|
||||
({ props }) => {
|
||||
@ -47,7 +47,8 @@ export default c([
|
||||
cB('icon', {
|
||||
raw: `
|
||||
font-size: ${iconSize};
|
||||
fill: ${iconColor}
|
||||
color: ${iconColor};
|
||||
transition: color .3s ${cubicBezierEaseInOut};
|
||||
`
|
||||
}),
|
||||
c('svg', {
|
||||
@ -61,8 +62,7 @@ export default c([
|
||||
`
|
||||
}, [
|
||||
cB('icon', {
|
||||
fill: iconColorHover,
|
||||
stroke: iconColorHover
|
||||
color: iconColorHover
|
||||
})
|
||||
]),
|
||||
c('&:active', {
|
||||
@ -71,8 +71,7 @@ export default c([
|
||||
`
|
||||
}, [
|
||||
cB('icon', {
|
||||
fill: iconColorPressed,
|
||||
stroke: iconColorPressed
|
||||
color: iconColorPressed
|
||||
})
|
||||
])
|
||||
])
|
||||
|
@ -7,14 +7,14 @@ export default create({
|
||||
getDerivedVariables ({ base, derived }) {
|
||||
const {
|
||||
popoverColor,
|
||||
textColorSecondaryOverlay,
|
||||
textColor2Overlay,
|
||||
primaryColorHover,
|
||||
primaryColorPressed
|
||||
} = derived
|
||||
return {
|
||||
...commonVariables,
|
||||
color: popoverColor,
|
||||
iconColor: textColorSecondaryOverlay,
|
||||
iconColor: textColor2Overlay,
|
||||
iconColorHover: primaryColorHover,
|
||||
iconColorPressed: primaryColorPressed,
|
||||
boxShadow: '0 2px 8px 0px rgba(0, 0, 0, .12)',
|
||||
|
@ -7,14 +7,14 @@ export default create({
|
||||
getDerivedVariables ({ base, derived }) {
|
||||
const {
|
||||
popoverColor,
|
||||
textColorSecondary,
|
||||
textColor2,
|
||||
primaryColorHover,
|
||||
primaryColorPressed
|
||||
} = derived
|
||||
return {
|
||||
...commonVariables,
|
||||
color: popoverColor,
|
||||
iconColor: textColorSecondary,
|
||||
iconColor: textColor2,
|
||||
iconColorHover: primaryColorHover,
|
||||
iconColorPressed: primaryColorPressed,
|
||||
boxShadow: '0 2px 8px 0px rgba(0, 0, 0, .12)',
|
||||
|
@ -19,27 +19,23 @@ export default c([
|
||||
}, [
|
||||
cB('breadcrumb-item', {
|
||||
fontSize: fontSize,
|
||||
transition: `
|
||||
color .3s ${cubicBezierEaseInOut}
|
||||
`
|
||||
transition: `color .3s ${cubicBezierEaseInOut}`
|
||||
}, [
|
||||
cB('icon', {
|
||||
raw: `
|
||||
font-size: 16px;
|
||||
font-size: 18px;
|
||||
vertical-align: -.2em;
|
||||
transition: color .3s ${cubicBezierEaseInOut};
|
||||
`,
|
||||
color: itemTextColor
|
||||
}),
|
||||
cE('link', {
|
||||
raw: `
|
||||
cursor: pointer;
|
||||
`,
|
||||
cursor: 'pointer',
|
||||
transition: `color .3s ${cubicBezierEaseInOut}`,
|
||||
color: itemTextColor
|
||||
}),
|
||||
cE('separator', {
|
||||
margin: '0 4px',
|
||||
margin: '0 6px',
|
||||
color: separatorColor,
|
||||
transition: `color .3s ${cubicBezierEaseInOut}`
|
||||
}),
|
||||
|
@ -21,6 +21,9 @@ export default c([
|
||||
height: labelHeight
|
||||
})
|
||||
]),
|
||||
cB('form-item-blank', {
|
||||
minHeight: pxfy(depx(blankHeight) + 6)
|
||||
}),
|
||||
cM('left-labelled', [
|
||||
cB('form-item-label', {
|
||||
fontSize: labelFontSizeLeft,
|
||||
|
@ -8,12 +8,12 @@ export default {
|
||||
feedbackFontSizeSmall: '13px',
|
||||
feedbackFontSizeMedium: '13px',
|
||||
feedbackFontSizeLarge: '14px',
|
||||
labelFontSizeSmallLeft: '14px',
|
||||
labelFontSizeMediumLeft: '14px',
|
||||
labelFontSizeLargeLeft: '15px',
|
||||
labelFontSizeSmallTop: '13px',
|
||||
labelFontSizeMediumTop: '13px',
|
||||
labelFontSizeLargeTop: '14px',
|
||||
labelFontSizeLeftSmall: '14px',
|
||||
labelFontSizeLeftMedium: '14px',
|
||||
labelFontSizeLeftLarge: '15px',
|
||||
labelFontSizeTopSmall: '13px',
|
||||
labelFontSizeTopMedium: '13px',
|
||||
labelFontSizeTopLarge: '14px',
|
||||
labelHeightSmall: '18px',
|
||||
labelHeightMedium: '18px',
|
||||
labelHeightLarge: '20px',
|
||||
|
@ -258,7 +258,7 @@ export default c([
|
||||
const pallete = props.$local
|
||||
return insideFormItem(
|
||||
status,
|
||||
cB('input', [
|
||||
cTB('input', [
|
||||
cM('stateful', [
|
||||
cE('border-mask', {
|
||||
border: pallete[createKey('border', status)]
|
||||
|
@ -50,7 +50,7 @@ export default {
|
||||
h('div', {
|
||||
class: 'n-message__icon'
|
||||
}, [
|
||||
h(NIcon, {
|
||||
h(NIcon, null, {
|
||||
default: () => [
|
||||
h(NIconSwitchTransition, null, {
|
||||
default: () => [
|
||||
|
@ -115,7 +115,11 @@ export default c([
|
||||
font-size: ${closeSize};
|
||||
margin: ${closeMargin};
|
||||
`
|
||||
}),
|
||||
}, [
|
||||
cB('icon', {
|
||||
transition: `color .3s ${cubicBezierEaseInOut}`
|
||||
})
|
||||
]),
|
||||
cM('closable', {
|
||||
padding: paddingClosable
|
||||
}),
|
||||
|
@ -6,6 +6,6 @@ export default {
|
||||
minWidth: '420px',
|
||||
iconMargin: '10px',
|
||||
closeMargin: '0 0 0 12px',
|
||||
closeSize: '24px',
|
||||
iconSize: '19px'
|
||||
closeSize: '16px',
|
||||
iconSize: '20px'
|
||||
}
|
||||
|
@ -40,6 +40,10 @@ export {
|
||||
inputDark,
|
||||
inputLight
|
||||
} from './input/styles'
|
||||
export {
|
||||
selectDark,
|
||||
selectLight
|
||||
} from './select/styles'
|
||||
export {
|
||||
checkboxDark,
|
||||
checkboxLight
|
||||
@ -248,10 +252,6 @@ export {
|
||||
anchorDark,
|
||||
anchorLight
|
||||
} from './anchor/styles'
|
||||
export {
|
||||
selectDark,
|
||||
selectLight
|
||||
} from './select/styles'
|
||||
export {
|
||||
statisticDark,
|
||||
statisticLight
|
||||
|
Loading…
Reference in New Issue
Block a user