diff --git a/components/lib/inputnumber/style/InputNumberStyle.js b/components/lib/inputnumber/style/InputNumberStyle.js index 7d358b72b..2529747ab 100644 --- a/components/lib/inputnumber/style/InputNumberStyle.js +++ b/components/lib/inputnumber/style/InputNumberStyle.js @@ -11,11 +11,11 @@ const theme = ({ dt }) => ` align-items: center; justify-content: center; flex: 0 0 auto; - curspor: pointer; + cursor: pointer; background: ${dt('inputnumber.button.background')}; color: ${dt('inputnumber.button.color')}; width: ${dt('inputnumber.button.width')}; - transition: background-color ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, outline-color ${dt('transition.duration')}; + transition: background ${dt('transition.duration')}, color ${dt('transition.duration')}, border-color ${dt('transition.duration')}, outline-color ${dt('transition.duration')}; } .p-inputnumber-button:hover { @@ -28,10 +28,6 @@ const theme = ({ dt }) => ` color: ${dt('inputnumber.button.active.color')}; } -.p-inputnumber-stacked { - overflow: hidden; -} - .p-inputnumber-stacked .p-inputnumber-button { position: relative; border: 0 none; @@ -48,12 +44,12 @@ const theme = ({ dt }) => ` .p-inputnumber-stacked .p-inputnumber-increment-button { padding: 0; - border-top-right-radius: calc(${dt('border.radius.md')} - 1px); + border-top-right-radius: calc(${dt('inputnumber.button.border.radius')} - 1px); } .p-inputnumber-stacked .p-inputnumber-decrement-button { padding: 0; - border-bottom-right-radius: calc(${dt('border.radius.md')} - 1px); + border-bottom-right-radius: calc(${dt('inputnumber.button.border.radius')} - 1px); } .p-inputnumber-stacked .p-inputnumber-button { @@ -98,7 +94,7 @@ const theme = ({ dt }) => ` .p-inputnumber-vertical .p-inputnumber-button { border: 1px solid ${dt('inputnumber.button.border.color')}; - padding: 0.5rem 0; + padding: ${dt('inputnumber.button.vertical.padding')}; 0; } .p-inputnumber-vertical .p-inputnumber-button:hover { diff --git a/components/lib/themes/aura/inputnumber/index.js b/components/lib/themes/aura/inputnumber/index.js index fb8ad1783..a8ebf9834 100644 --- a/components/lib/themes/aura/inputnumber/index.js +++ b/components/lib/themes/aura/inputnumber/index.js @@ -1,6 +1,8 @@ export default { button: { - width: '2.5rem' + width: '2.5rem', + borderRadius: '{form.field.border.radius}', + verticalPadding: '{form.field.padding.y}' }, colorScheme: { light: { diff --git a/components/lib/themes/lara/index.js b/components/lib/themes/lara/index.js index 77f7fa508..d147f8f53 100644 --- a/components/lib/themes/lara/index.js +++ b/components/lib/themes/lara/index.js @@ -228,7 +228,7 @@ export default { floatLabelColor: '{surface.500}', floatLabelFocusColor: '{surface.500}', floatLabelInvalidColor: '{red.400}', - iconColor: '{surface.400}', + iconColor: '{surface.500}', shadow: 'none' }, text: { diff --git a/components/lib/themes/lara/inputnumber/index.js b/components/lib/themes/lara/inputnumber/index.js index fb8ad1783..b63ba6bda 100644 --- a/components/lib/themes/lara/inputnumber/index.js +++ b/components/lib/themes/lara/inputnumber/index.js @@ -1,32 +1,34 @@ export default { button: { - width: '2.5rem' + width: '2.5rem', + borderRadius: '{form.field.border.radius}', + verticalPadding: '{form.field.padding.y}' }, colorScheme: { light: { button: { - background: 'transparent', - hoverBackground: '{surface.100}', - activeBackground: '{surface.200}', + background: '{surface.100}', + hoverBackground: '{surface.200}', + activeBackground: '{surface.300}', borderColor: '{form.field.border.color}', hoverBorderColor: '{form.field.border.color}', activeBorderColor: '{form.field.border.color}', - color: '{surface.400}', - hoverColor: '{surface.500}', - activeColor: '{surface.600}' + color: '{surface.600}', + hoverColor: '{surface.700}', + activeColor: '{surface.800}' } }, dark: { button: { - background: 'transparent', - hoverBackground: '{surface.800}', - activeBackground: '{surface.700}', + background: '{surface.800}', + hoverBackground: '{surface.700}', + activeBackground: '{surface.500}', borderColor: '{form.field.border.color}', hoverBorderColor: '{form.field.border.color}', activeBorderColor: '{form.field.border.color}', - color: '{surface.400}', - hoverColor: '{surface.300}', - activeColor: '{surface.200}' + color: '{surface.300}', + hoverColor: '{surface.200}', + activeColor: '{surface.100}' } } }