Skip to content

Commit 94ccca7

Browse files
authored
Merge pull request #391 from solid-connection/fix/css-alls
fix: move university card border style to inner div
2 parents 35e9620 + e33c349 commit 94ccca7

File tree

4 files changed

+39
-41
lines changed

4 files changed

+39
-41
lines changed
14.1 KB
Loading
8.87 KB
Loading
9.45 KB
Loading

apps/web/src/components/ui/UniverSityCard/index.tsx

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,51 +17,49 @@ const UniversityCard = ({ university, showCapacity = true }: UniversityCardProps
1717
: university.koreanName;
1818

1919
return (
20-
<Link
21-
className="relative h-[91px] w-full overflow-hidden rounded-lg border border-solid border-k-100 hover:-translate-y-0.5 hover:shadow-md hover:shadow-black/10"
22-
href={`/university/${university.id}`}
23-
aria-labelledby={`university-name-${university.id}`}
24-
>
25-
<div className="flex justify-between px-5 py-3.5">
26-
<div className="flex gap-[23.5px]">
27-
<div className="flex flex-shrink-0 items-center">
28-
<Image
29-
className="h-14 w-14 rounded-full object-cover"
30-
src={convertImageUrl(university.logoImageUrl)}
31-
width={56}
32-
height={56}
33-
alt="대학 이미지"
34-
/>
35-
</div>
20+
<Link className="block" href={`/university/${university.id}`} aria-labelledby={`university-name-${university.id}`}>
21+
<div className="relative h-[91px] w-full overflow-hidden rounded-lg border border-solid border-k-100 hover:-translate-y-0.5 hover:shadow-md hover:shadow-black/10">
22+
<div className="flex justify-between px-5 py-3.5">
23+
<div className="flex gap-[23.5px]">
24+
<div className="flex flex-shrink-0 items-center">
25+
<Image
26+
className="h-14 w-14 rounded-full object-cover"
27+
src={convertImageUrl(university.logoImageUrl)}
28+
width={56}
29+
height={56}
30+
alt="대학 이미지"
31+
/>
32+
</div>
3633

37-
<div className="flex flex-col">
38-
<span
39-
id={`university-name-${university.id}`}
40-
className="truncate text-k-700 typo-bold-4"
41-
aria-label={convertedKoreanName}
42-
>
43-
{convertedKoreanName}
44-
</span>
45-
<div className="flex items-center gap-2.5">
46-
<span className="text-k-500 typo-medium-4">
47-
{university.country} | {university.region}
34+
<div className="flex flex-col">
35+
<span
36+
id={`university-name-${university.id}`}
37+
className="truncate text-k-700 typo-bold-4"
38+
aria-label={convertedKoreanName}
39+
>
40+
{convertedKoreanName}
4841
</span>
49-
{showCapacity && <span className="text-primary typo-sb-11">모집 {university.studentCapacity}</span>}
50-
</div>
51-
<div className="flex gap-4">
52-
{university.languageRequirements.slice(0, 3).map((requirement) => {
53-
const testName = shortenLanguageTestName(requirement.languageTestType);
54-
return (
55-
<span key={requirement.languageTestType} className="whitespace-nowrap text-primary typo-sb-11">
56-
{testName ?? requirement.languageTestType} {requirement.minScore}
57-
</span>
58-
);
59-
})}
42+
<div className="flex items-center gap-2.5">
43+
<span className="text-k-500 typo-medium-4">
44+
{university.country} | {university.region}
45+
</span>
46+
{showCapacity && <span className="text-primary typo-sb-11">모집 {university.studentCapacity}</span>}
47+
</div>
48+
<div className="flex gap-4">
49+
{university.languageRequirements.slice(0, 3).map((requirement) => {
50+
const testName = shortenLanguageTestName(requirement.languageTestType);
51+
return (
52+
<span key={requirement.languageTestType} className="whitespace-nowrap text-primary typo-sb-11">
53+
{testName ?? requirement.languageTestType} {requirement.minScore}
54+
</span>
55+
);
56+
})}
57+
</div>
6058
</div>
6159
</div>
62-
</div>
63-
<div className="flex items-center">
64-
<CheveronRightFilled color="black" opacity="0.54" />
60+
<div className="flex items-center">
61+
<CheveronRightFilled color="black" opacity="0.54" />
62+
</div>
6563
</div>
6664
</div>
6765
</Link>

0 commit comments

Comments
 (0)