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.

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

[๐Ÿ’… design system] ์ด๋ฏธ์ง€ ๊ฐค๋Ÿฌ๋ฆฌ ์ปดํฌ๋„ŒํŠธ ์ƒ์„ฑ #55

Merged
merged 2 commits into from
Aug 14, 2024

Conversation

Pyotato
Copy link
Collaborator

@Pyotato Pyotato commented Aug 12, 2024

PULL REQUEST TEMPLATE

PR ์„ค๋ช…

@appear

๋‹ค์Œ๊ณผ ๊ฐ™์ด ์—ฌ๋Ÿฌ ์ด๋ฏธ์ง€๋“ค์„ ๋ณด์—ฌ์ค˜์•ผํ•  ๋•Œ ์“ฐ๋Š” ๊ฐค๋Ÿฌ๋ฆฌ ์ปดํฌ๋„ŒํŠธ์ž…๋‹ˆ๋‹ค.

  • default
image
  • post
image

์Šคํฌ๋ฆฐ์ƒท & URL

  • post ๊ฐค๋Ÿฌ๋ฆฌ , ์ตœ๋Œ€ 5์žฅ
image
  • ์ดˆ๊ณผ ์‹œ
image
  • default ๊ฐค๋Ÿฌ๋ฆฌ , ์ตœ๋Œ€ 5์žฅ
image
  • ์ดˆ๊ณผ ์‹œ
image
  • 1 ~ 4 ๊ฐœ์ผ ๊ฒฝ์šฐ๋Š” ๊ณตํ†ต์ ์œผ๋กœ ๋‹ค์Œ๊ณผ ๊ฐ™์ด ๊ทธ๋ ค์ง‘๋‹ˆ๋‹ค

    • 4๊ฐœ
image
  • 3๊ฐœ
image
  • 2๊ฐœ
image
  • 1๊ฐœ
image

Copy link

Comment on lines +41 to +60
<Image
src={url}
alt={url}
width={DEFAULT_IMG_SIZE_PX}
height={DEFAULT_IMG_SIZE_PX}
className={cx("gallery-item", "overlay", variant)}
key={url + index}
/>
</div>
) : (
<Image
src={url}
alt={url}
width={DEFAULT_IMG_SIZE_PX}
height={DEFAULT_IMG_SIZE_PX}
className={cx("gallery-item", variant)}
key={url + index}
/>
)
)}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๊ฐค๋Ÿฌ๋ฆฌ๋กœ ๋ณด์—ฌ์ค„ ์š”์†Œ๊ฐ€ ์ด๋ฏธ์ง€๊ฐ€ ์•„๋‹Œ ์˜์ƒ์ผ ๊ฐ€๋Šฅ์„ฑ๋„ ์žˆ์–ด์„œ
#54 ์™€ #56 ์—์„œ ๋งŒ๋“ค์–ด์„œ ํ™•์žฅ์ž๋ช…์— ๋”ฐ๋ผ ๋ณด์—ฌ์ค„ ์ปดํฌ๋„ŒํŠธ๋กœ ๋Œ€์ฒดํ•  ๊ฑฐ ๊ฐ™์Šต๋‹ˆ๋‹น

Comment on lines +122 to +134
@if $i == 5 {
grid-template-columns: repeat(6, 1fr);
grid-template-rows: repeat(2, 1fr);
.gallery-item {
&:nth-child(1),
&:nth-child(2) {
grid-column: span 3;
}
&:nth-child(n + 3):nth-child(-n + 5) {
grid-column: span 2;
}
}
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๋Œ“๊ธ€์— ์ฒจ๋ถ€ํ•œ ์ด๋ฏธ์ง€(/์˜์ƒ ํฌํ•จ์˜ˆ์ •)๋“ค์€ ๋‹ค์Œ๊ณผ ๊ฐ™์ด ๊ทธ๋ ค์ฃผ๊ธฐ ์œ„ํ•œ ์Šคํƒ€์ผ์ž…๋‹ˆ๋‹ค.
image

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์ด๋ฏธ์ง€์— cover ๊ฐ™์€๊ฑฐ ์ ์šฉํ•ด์ค˜๋„ ์ข‹๊ฒ ๋„ค์š” ..! ใ…‹ใ…‹ใ…‹ใ…‹ ๋น„์œจ์ด ..!

Copy link
Collaborator Author

@Pyotato Pyotato Aug 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#62 (comment) ๋ฐ˜์˜์™„๋ฃŒ!

Comment on lines +97 to +100
&.gallery-img-length-#{$i}:not(.post) {
@if $i == 5 {
grid-template-columns: repeat(4, 1fr);
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์นด๋“œ ์ปดํฌ๋„ŒํŠธ์™€ ๋Œ“๊ธ€ ์ด์™ธ์˜ ๊ฐค๋Ÿฌ๋ฆฌ๋“ค์€ ๋‹ค์Œ๊ณผ ๊ฐ™์ด ๊ทธ๋ ค์ฃผ๊ธฐ ์œ„ํ•œ ์Šคํƒ€์ผ๋ง์ž…๋‹ˆ๋‹ค.

image

Comment on lines +56 to +94
@mixin gallery-template($i) {
@if ($i==4) {
grid-template-columns: repeat(4, 1fr);
grid-template-rows: repeat(3, 1fr);
.gallery-item {
&:nth-child(1) {
grid-column: span 3;
grid-row: span 3;
}
&:nth-child(2),
&:nth-child(3),
&:nth-child(4) {
grid-column: span 1;
grid-column: span 1;
}
}
} @else if($i==3) {
grid-template-columns: repeat(3, 1fr);
grid-template-rows: repeat(2, 1fr);
.gallery-item {
&:nth-child(1) {
grid-column: span 2;
grid-row: span 2;
}
&:nth-child(2),
&:nth-child(3) {
grid-column: span 1;
grid-column: span 1;
}
}
} @else if($i==2) {
grid-template-columns: repeat(2, 1fr);
grid-template-rows: repeat(1, 1fr);
.gallery-item {
grid-column: span 1;
grid-row: span 1;
}
}
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

๋ชจ๋“  ๊ฐค๋Ÿฌ๋ฆฌ ์ปดํฌ๋„ŒํŠธ๋Š” 1 - 4 ๊ฐœ์˜ ์ด๋ฏธ์ง€/์˜์ƒ์„ ๋ณด์—ฌ์ค„ ๋•Œ ๊ณตํ†ต์œผ๋กœ ๋ณด์—ฌ์ค„ ์Šคํƒ€์ผ์ž…๋‹ˆ๋‹ค.

@@ -0,0 +1,71 @@
import classNames from "classnames/bind";
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์–˜ ํŒŒ์ผ๋ช…์€ ์™œ _gallery ์ธ๊ฐ€์šฉ ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

index.ts ๋ฅผ ๋งจ ์•„๋ž˜์— ๋ฐฐ์น˜ํ•˜๊ณ  ์‹ถ์–ด์„œ ํŒŒ์ผ๋ช…๋“ค ์•ž์— ๋‹ค _๋ฅผ ๋ถ™์—ฌ์คฌ์Šต๋‹ˆ๋‹น๐Ÿ˜…

import Image from "next/image";
import Style from "./_gallery.module.scss";

const MAX_IMAGE_COUNT = 5;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Gallery ์ด๋ฏธ์ง€์—์„œ MAX_IMAGE_COUNT ๋ฅผ ์ •ํ•ด๋ฒ„๋ฆฌ๋Š”๊ฑด ์กฐ๊ธˆ ์–ด์ƒ‰ํ•œ ๊ฒƒ ๊ฐ™์•„์š” ..!
๋ณดํ†ต ์™ธ๋ถ€์—์„œ ๋„ฃ์–ด์ฃผ๊ฑฐ๋‚˜ ๋„ฃ์–ด์ฃผ๋Š” ์ด๋ฏธ์ง€ ๊ฐฏ์ˆ˜์—๋”ฐ๋ผ ์•Œ์•„์„œ ์กฐ์ ˆ๋˜๋Š”๊ฒŒ ์ข‹์„ ๊ฒƒ ๊ฐ™์€๋ฐ ..!

@Pyotato Pyotato merged commit 609e8d4 into 21-design-system Aug 14, 2024
1 check passed
@Pyotato
Copy link
Collaborator Author

Pyotato commented Aug 14, 2024

์‹ค์ˆ˜๋กœ ๋จธ์ง€ํ•œ ๊ฑฐ ๊ฐ™์•„์š”ใ…œใ…œ revertํ•ด๋ณด๊ฒ ์Šต๋‹ˆ๋‹คใ…œใ…œ

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants