Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] 잠금의 경우에도 현재 레벨이라는 텍스트가 보이는 부분을 수정 #532

Merged
merged 2 commits into from
Feb 11, 2024
Merged

[Fix] 잠금의 경우에도 현재 레벨이라는 텍스트가 보이는 부분을 수정 #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88e0cfa
style: card banner border fix!
sumi-0011 Feb 10, 2024
f6476f5
fix: 잠겨있는 레벨은 현재 레벨 텍스트 보이지 않기
sumi-0011 Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/app/level/guide/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function LevelGuidePage() {
) : (
<>
<section className={levelTextWrapperCss}>
<p className={levelLabelCss}>현재 레벨</p>
<p className={levelLabelCss}>{!isLockedLevel && '현재 레벨'}</p>
<div className={cx(badgeCss)}>
<MotionDiv key={selectLevelInfo.label}>{selectLevelInfo.label}</MotionDiv>
</div>
Expand Down Expand Up @@ -95,6 +95,7 @@ const levelLabelCss = css({
textStyle: 'body5',
color: 'purple.purple700',
marginBottom: '8px',
height: '17px',
});

const badgeCss = css({
Expand Down
28 changes: 20 additions & 8 deletions src/components/Banner/CardBanner.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,44 @@ import { css } from '@/styled-system/css';

function CardBanner(props: CardBannerType) {
return (
<div className={containerCss}>
<div>
<Image src={props.iconUrl} width={20} height={20} alt={props.title} />
<div className={outerContainerCss}>
<div className={containerCss}>
<div>
<Image src={props.iconUrl} width={20} height={20} alt={props.title} />
</div>
<p className={descriptionCss}>{props.description}</p>
<p className={titleCss}>{props.title}</p>
</div>
<p className={descriptionCss}>{props.description}</p>
<p className={titleCss}>{props.title}</p>
</div>
);
}

export default CardBanner;

const containerCss = css({
minWidth: 'fit-content',
width: '100%',
height: '100%',
minWidth: 'fit-content',
overflow: 'hidden',
borderRadius: '22px',
boxShadow: '0px 10px 30px 4px rgba(78, 80, 122, 0.20) inset, 0px 4px 20px 0px rgba(15, 16, 23, 0.30)',
border: ' 1px solid #474A5D',
padding: '20px 16px 16px',
background: 'linear-gradient(136deg, rgba(168, 184, 240, 0.02) 15.95%, rgba(165, 143, 255, 0.02) 85.07%)',
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
});

const outerContainerCss = css({
overflow: 'hidden',
border: '1px solid transparent',
borderRadius: '22px',
padding: '0px !', // NOTE: padding 0 필수,
backgroundOrigin: 'border-box',
backgroundClip: 'content-box, border-box',
backgroundImage:
'linear-gradient(token(colors.bg.surface3), token(colors.bg.surface3)), token(colors.gradients.stroke)',
});

const descriptionCss = css({
marginTop: '8px',
textStyle: 'body4',
Expand Down
Loading