diff --git a/assets/design-system/src/components/Button.tsx b/assets/design-system/src/components/Button.tsx index c6d851ebbe..09ec211322 100644 --- a/assets/design-system/src/components/Button.tsx +++ b/assets/design-system/src/components/Button.tsx @@ -35,6 +35,7 @@ export type ButtonProps = { innerFlexProps?: FlexProps // flags- keeping this pattern instead of using "size" and "type" for backwards compatibility small?: boolean + medium?: boolean large?: boolean primary?: boolean secondary?: boolean @@ -75,6 +76,7 @@ const Button = memo( disabled, children, small, + medium, large, secondary, tertiary, @@ -97,7 +99,7 @@ const Button = memo( 'auto' ) - const buttonSize = large ? 'large' : small ? 'small' : 'medium' + const buttonSize = large ? 'large' : medium && !small ? 'medium' : 'small' const buttonType = secondary ? 'secondary' : tertiary diff --git a/assets/design-system/src/components/Input2.tsx b/assets/design-system/src/components/Input2.tsx index 7e0cabfb30..65ec08417c 100644 --- a/assets/design-system/src/components/Input2.tsx +++ b/assets/design-system/src/components/Input2.tsx @@ -234,6 +234,7 @@ function Input2({ titleContent, size, small, + medium, large, raised = false, onEnter, @@ -288,7 +289,7 @@ function Input2({ const parentFillLevel = useFillLevel() - size = size || (large ? 'large' : small ? 'small' : 'medium') + size = size || (large ? 'large' : medium && !small ? 'medium' : 'small') inputProps = mergeProps(useFormField()?.fieldProps ?? {}, inputProps) diff --git a/assets/design-system/src/components/ListBoxItem.tsx b/assets/design-system/src/components/ListBoxItem.tsx index 31e2de32a0..a8afd113cd 100644 --- a/assets/design-system/src/components/ListBoxItem.tsx +++ b/assets/design-system/src/components/ListBoxItem.tsx @@ -41,7 +41,7 @@ const ListBoxItemInner = styled.div>( alignItems: 'center', position: 'relative', width: 'auto', - padding: `${theme.spacing.xsmall}px ${theme.spacing.medium}px`, + padding: `${theme.spacing.xxsmall}px ${theme.spacing.small}px`, backgroundColor: 'none', cursor: 'pointer', '&:hover': { @@ -147,7 +147,7 @@ const ListBoxFooterInner = styled.button<{ $focused?: boolean }>( display: 'flex', position: 'relative', width: '100%', - padding: `${theme.spacing.small}px ${theme.spacing.medium}px`, + padding: `${theme.spacing.xsmall}px ${theme.spacing.small}px`, '&:hover': { backgroundColor: theme.mode === 'light' diff --git a/assets/design-system/src/components/Select.tsx b/assets/design-system/src/components/Select.tsx index efc4696ebe..b3c6ef11e3 100644 --- a/assets/design-system/src/components/Select.tsx +++ b/assets/design-system/src/components/Select.tsx @@ -168,7 +168,7 @@ const SelectButtonInner = styled.div<{ display: 'flex', flexDirection: 'row', flexShrink: 1, - padding: `${size === 'medium' ? 9 : 5}px ${theme.spacing.medium}px`, + padding: `${size === 'large' ? 13 : size === 'medium' ? 9 : 5}px ${theme.spacing.medium}px`, width: '100%', '.children': { flexGrow: 1, @@ -221,7 +221,7 @@ function SelectButton({ children, showArrow = true, isOpen, - size = 'medium', + size = 'small', transparent = false, isDisabled, ...props @@ -299,7 +299,7 @@ function Select({ name, triggerButton, placement, - size = 'medium', + size = 'small', width, maxHeight, transparent = false, diff --git a/assets/design-system/src/theme.tsx b/assets/design-system/src/theme.tsx index 5f7229d64f..3d59ee18b0 100644 --- a/assets/design-system/src/theme.tsx +++ b/assets/design-system/src/theme.tsx @@ -203,8 +203,12 @@ const getHonorableThemeProps = ({ mode }: { mode: ColorMode }) => { { width: '100%', flex: '1 1', - height: '38px', - lineHeight: '38px', + height: '30px', + lineHeight: '30px', + // caption type, written out because the `caption` alias resolves from + // props and would drag its own 16px line height along with it + fontSize: 12, + letterSpacing: '0.5px', color: 'text', _placeholder: { color: 'text-xlight', @@ -219,6 +223,7 @@ const getHonorableThemeProps = ({ mode }: { mode: ColorMode }) => { large && { height: '46px', lineHeight: '46px', + fontSize: 14, }, ({ disabled }: any) => disabled && { @@ -234,8 +239,8 @@ const getHonorableThemeProps = ({ mode }: { mode: ColorMode }) => { paddingLeft: 'medium', paddingRight: 'medium', lineHeight: 'inherit', - paddingTop: 9, - paddingBottom: 9, + paddingTop: 7, + paddingBottom: 7, }, ({ small }: any) => small && {