Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/app/my/_ui/MyProfileContent/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const MyProfileContent = () => {
</p>
</div>
{/* Profile Card */}
<div className="mb-4 rounded-lg bg-gray-50 p-4">
<div className="mb-4 rounded-lg bg-gray-c-300 p-4">
<div className="mb-3 flex items-center space-x-3">
<ProfileWithBadge profileImageUrl={profileImageUrl} width={48} height={48} />
<div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/university/search/SearchBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const SearchBar = ({ initText }: SearchBarProps) => {
<input
type="text"
placeholder={"해외 파견 학교를 검색하세요."}
className="w-full rounded-lg border border-gray-200 bg-k-50 p-3 pl-4 pr-10 text-k-600 focus:border-primary"
className="w-full rounded-lg border border-gray-c-200 bg-k-50 p-3 pl-4 pr-10 text-k-600 focus:border-primary"
{...register("searchText")}
/>
<div className="absolute right-3 top-1/2 h-5 w-5 -translate-y-1/2 text-gray-400">
Expand Down
15 changes: 11 additions & 4 deletions src/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@

@layer base {
html {
font-family: var(--font-pretendard), system-ui, -apple-system, sans-serif;
font-family:
var(--font-pretendard),
system-ui,
-apple-system,
sans-serif;
font-synthesis: none;
text-rendering: optimizeLegibility;
-webkit-font-smoothing: antialiased;
Expand All @@ -13,7 +17,10 @@

body {
@apply m-0 bg-white;
font-family: system-ui, -apple-system, sans-serif;
font-family:
system-ui,
-apple-system,
sans-serif;
}
}

Expand All @@ -39,15 +46,15 @@
}

.score-table th {
@apply typo-sb-7 text-black;
@apply text-black typo-sb-7;
}

.score-table tbody tr {
@apply flex h-10 items-center px-3 py-0;
}

.score-table td {
@apply min-w-[30px] flex-1 overflow-hidden whitespace-nowrap typo-medium-3 text-gray-600;
@apply min-w-[30px] flex-1 overflow-hidden whitespace-nowrap text-gray-600 typo-medium-3;
}

.score-table td:nth-of-type(5) {
Expand Down
8 changes: 5 additions & 3 deletions tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ const config: Config = {
},
"gray-c": {
"100": "#ececec",
"200": "#e5e7eb",
"300": "#f9fafb",
Copy link
Contributor

Choose a reason for hiding this comment

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

피그마상에서도 해당 디자인을 가져가나요?
색상이 원래 없었는데 달라져서 그런지 확인한번 해주셔도 좋을것 같아요
피그마 디자인 토큰에 없는 색상인데 누락된것인지 gray-c가 원래 존재하는지 피그마 dev모드 로 확인 해주시면 좋겠네요.

요약

  1. 피그마 dev모드에서 색상확인
  2. 피그마 dev 모드에서 디자인토큰이 gray-c 인지 확인

},
// 하드코딩된 회색 계열 색상
gray: {
Expand Down Expand Up @@ -317,9 +319,9 @@ const config: Config = {
height: "height",
},
borderRadius: {
lg: "var(--radius)",
md: "calc(var(--radius) - 2px)",
sm: "calc(var(--radius) - 4px)",
lg: "8px",
md: "6px",
sm: "4px",
},
animation: {
"slide-up": "slideUp 0.3s ease-out",
Expand Down