Skip to content

Commit

Permalink
Merge branch 'fe-dev' into feature/#754
Browse files Browse the repository at this point in the history
  • Loading branch information
pakxe authored Oct 17, 2024
2 parents 90956d8 + 1843235 commit 03233e8
Show file tree
Hide file tree
Showing 35 changed files with 224 additions and 452 deletions.
88 changes: 44 additions & 44 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@eslint/compat": "^1.1.0",
"@eslint/js": "^9.6.0",
"@jest/types": "^29.6.3",
"@sentry/webpack-plugin": "^2.22.0",
"@sentry/webpack-plugin": "^2.22.5",
"@storybook/addon-essentials": "^8.2.2",
"@storybook/addon-interactions": "^8.2.2",
"@storybook/addon-links": "^8.2.2",
Expand Down
1 change: 1 addition & 0 deletions client/src/GlobalStyle.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export const GlobalStyle = css`
#root {
display: flex;
justify-content: center;
-webkit-tap-highlight-color: transparent;
}
button {
Expand Down
7 changes: 6 additions & 1 deletion client/src/components/Design/components/Banner/Banner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ const Banner = ({title, description, buttonText, onDelete, ...buttonProps}: Bann
cssProp={{borderRadius: '0.75rem'}}
>
<Flex gap="0.5rem">
<IconButton variants="none" onClick={onDelete} style={{display: 'flex', alignItems: 'flex-start'}}>
<IconButton
variants="none"
onClick={onDelete}
style={{display: 'flex', alignItems: 'flex-start'}}
aria-label="배너 닫기"
>
<Icon iconType="x" />
</IconButton>
<div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {useTheme} from '@components/Design/theme/HDesignProvider';

import Text from '../Text/Text';
import Icon from '../Icon/Icon';
import IconButton from '../IconButton/IconButton';

import {chipButtonStyle} from './ChipButton.style';

Expand All @@ -16,10 +17,13 @@ interface Props {

const ChipButton = ({color, text, onClick}: Props) => {
const {theme} = useTheme();

return (
<div css={chipButtonStyle({color, theme})}>
<Text textColor="black">{text}</Text>
<Icon iconType="inputDelete" onClick={onClick} />
<IconButton variants="none" onClick={onClick} aria-label="인원 지우기">
<Icon iconType="inputDelete" />
</IconButton>
</div>
);
};
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 03233e8

Please sign in to comment.