Skip to content

Commit

Permalink
Merge pull request #430 from sopt-makers/develop
Browse files Browse the repository at this point in the history
[Deploy] NPS, mobile font size 수정
  • Loading branch information
lydiacho authored Aug 24, 2024
2 parents 061e6ab + 8577a94 commit f4b77f5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 22 deletions.
4 changes: 2 additions & 2 deletions src/common/components/Input/components/InputLine/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { useFormContext } from 'react-hook-form';

import { DeviceTypeContext } from '@store/deviceTypeContext';

import { inputFontVar, inputLineVar, inputVar } from './style.css';
import { inputFont, inputLineVar, inputVar } from './style.css';
import { formatBirthdate } from './utils/formatBirthdate';
import { formatPhoneNumber } from './utils/formatPhoneNumber';
import { TextBoxProps } from '../../types';
Expand Down Expand Up @@ -50,7 +50,7 @@ const InputLine = ({
<input
id={name}
defaultValue={defaultValue}
className={`${inputVar[errors[name] ? 'error' : 'default']} ${inputFontVar[deviceType]}`}
className={`${inputVar[errors[name] ? 'error' : 'default']} ${inputFont}`}
{...inputElementProps}
{...register(name, {
required: required && '필수 입력 항목이에요.',
Expand Down
24 changes: 7 additions & 17 deletions src/common/components/Input/components/InputLine/style.css.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,21 +64,11 @@ export const inputVar = styleVariants(formColors, ({ boxShadow, focusShadow }) =
},
]);

export const inputFontVar = styleVariants(
{
DESK: theme.font.BODY_2_16_R,
TAB: theme.font.BODY_2_16_R,
MOB: theme.font.BODY_3_14_R,
},
(font) => [
{
color: theme.color.baseText,
...font,
export const inputFont = style({
color: theme.color.baseText,
...theme.font.BODY_2_16_R,

'::placeholder': {
color: theme.color.placeholder,
...font,
},
},
],
);
'::placeholder': {
color: theme.color.placeholder,
},
});
3 changes: 0 additions & 3 deletions src/views/CompletePage/components/Survey.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ const Survey = () => {
setTimeout(() => {
setPoint('CHANGED');
}, 200);
setTimeout(() => {
setPoint(-1);
}, 2200);
};

const { mutate } = useMutateSatisfaction({ onSuccess: handleSatisfaction });
Expand Down

0 comments on commit f4b77f5

Please sign in to comment.