Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/depromeet/15th-Team2-Web in…
Browse files Browse the repository at this point in the history
…to feat/profile
  • Loading branch information
summermong committed Aug 28, 2024
2 parents cbe5f57 + 5a17e45 commit 95ef16e
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useAtomValue } from 'jotai';

import { Image, LoadingArea } from '@/components/atoms';
import { useCurrentMemberInfo } from '@/hooks';
import SwimieCharacterImage from '@/public/images/swimie-character.png';
import { calendarSwimCountAtom } from '@/store';
import { css } from '@/styled-system/css';
import { flex } from '@/styled-system/patterns';
Expand All @@ -23,10 +24,9 @@ export const UserCalendarProfile = () => {
<>
<div className={profileContainerStyles}>
<Image
className={characterImageStyles}
width={70}
height={75}
src="/images/swimie-character.png"
width={91}
height={88}
src={SwimieCharacterImage}
alt="swimie character"
priority
/>
Expand All @@ -46,19 +46,13 @@ export const UserCalendarProfile = () => {
};

const profileContainerStyles = flex({
padding: '0px 14px',
gap: '4px',
padding: '0px 15px',
gap: '10px',
alignItems: 'center',
borderRadius: '6px',
backgroundColor: 'primary.swim.총거리.default',
});

const characterImageStyles = css({
minWidth: '70px',
minHeight: '75px',
margin: '14px 10px -1px 10px',
});

const userInfoStyles = flex({
height: 'full',
direction: 'column',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,12 @@ const TimeLineCardBody = ({
</div>
{imageUrl && (
<div className={imageWrapperStyles}>
<Image src={imageUrl} alt="recorded image" fill />
<Image
src={imageUrl}
alt="recorded image"
fill
style={{ objectFit: 'cover' }}
/>
</div>
)}
</div>
Expand Down
3 changes: 2 additions & 1 deletion features/record-detail/components/cheer-modal-item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ const profile = {
cursor: 'pointer',
}),

imageStyle: css({
imageStyle: flex({
justify: 'center',
rounded: 'full',
w: '16px',
h: '16px',
Expand Down
2 changes: 1 addition & 1 deletion features/record/components/organisms/photo-section.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export function PhotoSection({ title, defaultImage }: PhotoSectionProps) {
alt="오늘의 사진"
fill
sizes="100vw"
className={css({ borderRadius: '10px' })}
className={css({ borderRadius: '10px', objectFit: 'cover' })}
/>
<DeletePhotoIcon
className={css({
Expand Down
Binary file modified public/images/swimie-character.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 95ef16e

Please sign in to comment.