Skip to content

Commit 182ce9e

Browse files
Minkyu0424Minkyu0424
authored
Merge pull request #141 from TaskFlow-CLAP/CLAP-360
CLAP-360 UI/UX 개선 Tony.tsx
2 parents 9ec2f92 + 02eb0e7 commit 182ce9e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+174
-183
lines changed

‎index.html‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="">
33
<head>
4-
<meta charset="UTF-8">
5-
<link rel="icon" href="/favicon.ico">
6-
<meta name="viewport" content="width=device-width, initial-scale=1.0">
7-
<title>TaskFlow</title>
4+
<meta charset="UTF-8" />
5+
<link
6+
rel="icon"
7+
href="/favicon.ico" />
8+
<meta
9+
name="viewport"
10+
content="width=device-width, initial-scale=1.0" />
11+
<title>TaskFlow - 스마트한 업무 관리</title>
812
</head>
913
<body>
1014
<div id="app"></div>
11-
<script type="module" src="/src/main.ts"></script>
15+
<script
16+
type="module"
17+
src="/src/main.ts"></script>
1218
</body>
1319
</html>

‎src/assets/fonts/SUIT-Variable.woff2‎

610 KB
Binary file not shown.

‎src/assets/styles.css‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44

55
@font-face {
66
font-family: 'SUIT-Variable';
7-
src: url('@/assets/fonts/SUIT-Variable.ttf') format('truetype');
8-
font-weight: normal;
7+
src:
8+
url('@/assets/fonts/SUIT-Variable.woff2') format('woff2'),
9+
url('@/assets/fonts/SUIT-Variable.ttf') format('truetype');
10+
font-weight: 100 900;
911
font-style: normal;
12+
font-display: swap;
1013
}
1114

1215
body {
@@ -108,10 +111,10 @@ body {
108111
}
109112

110113
.request-task-dropdown {
111-
@apply flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black;
114+
@apply flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer;
112115
}
113116
.request-task-dropdown-option-list {
114-
@apply absolute w-full h-40 overflow-y-auto top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow-custom text-black;
117+
@apply absolute w-full h-40 overflow-y-auto top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow-custom;
115118
}
116119
.request-task-dropdown-option {
117120
@apply w-full flex items-center h-11 p-2 rounded hover:bg-background-2 cursor-pointer;
@@ -140,7 +143,7 @@ body {
140143
@apply w-full flex items-center h-10 p-2 rounded hover:bg-background-2 cursor-pointer;
141144
}
142145
.task-detail-manager-dropdown {
143-
@apply flex w-full h-10 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black;
146+
@apply flex w-full h-10 items-center rounded p-4 bg-white border border-border-1 cursor-pointer;
144147
}
145148

146149
.modal-enter-active,

‎src/components/common/EditInformation.vue‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
:isOpen="isModalVisible"
55
:type="'successType'"
66
@close="handleCancel">
7-
<template #header> 정보가 수정되었습니다 </template>
7+
<template #header>정보가 수정되었습니다</template>
88
</ModalView>
99

1010
<ModalView
1111
:isOpen="isWarnningModalVisible"
1212
:type="'warningType'"
1313
@click="changePw"
1414
@close="warningModalToggle">
15-
<template #header> 정보가 저장되지 않았습니다 </template>
16-
<template #body> 수정 사항을 삭제하고 이동하시겠습니까? </template>
15+
<template #header>정보가 저장되지 않았습니다</template>
16+
<template #body>수정 사항을 삭제하고 이동하시겠습니까?</template>
1717
</ModalView>
1818

1919
<div class="profile">
@@ -51,7 +51,7 @@
5151
<span class="absolute top-1 right-2 text-xs text-gray-500"> {{ name.length }} / 10 </span>
5252
<input
5353
:class="[
54-
'block w-full px-4 py-4 border rounded focus:outline-none h-11 mt-2 text-black',
54+
'block w-full px-4 py-4 border rounded focus:outline-none h-11 mt-2',
5555
isInvalid || isFull ? 'border-red-1' : 'border-border-1'
5656
]"
5757
placeholder="이름을 입력해주세요"
@@ -74,21 +74,21 @@
7474
</div>
7575
<div class="flex flex-col">
7676
<p class="text-body text-xs font-bold">아이디</p>
77-
<p class="mt-2 text-black">{{ info.nickname }}</p>
77+
<p class="mt-2">{{ info.nickname }}</p>
7878
</div>
7979
<div class="flex flex-col">
8080
<p class="text-body text-xs font-bold">이메일</p>
81-
<p class="mt-2 text-black">{{ info.email }}</p>
81+
<p class="mt-2">{{ info.email }}</p>
8282
</div>
8383
<div class="flex flex-col">
8484
<p class="text-body text-xs font-bold">부서</p>
85-
<p class="mt-2 text-black">{{ info.departmentName }}</p>
85+
<p class="mt-2">{{ info.departmentName }}</p>
8686
</div>
8787
<div
8888
v-if="info.departmentRole"
8989
class="flex flex-col">
9090
<p class="text-body text-xs font-bold">직무</p>
91-
<p class="mt-2 text-black">{{ info.departmentRole }}</p>
91+
<p class="mt-2">{{ info.departmentRole }}</p>
9292
</div>
9393
<div>
9494
<p class="text-body text-xs font-bold">알림 수신 여부</p>

‎src/components/common/FormCheckbox.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
{ 'bg-primary1 text-white': isChecked, 'border border-disabled': !isChecked }
1515
]"
1616
:style="isChecked ? { fill: 'white' } : {}" />
17-
<p class="text-black">{{ checkButtonName }}</p>
17+
<p>{{ checkButtonName }}</p>
1818
</div>
1919
</div>
2020
</template>

‎src/components/common/ModalView.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
v-if="type == 'warningType'"
2121
:name="warningIcon" />
2222

23-
<div class="flex text-2xl font-bold justify-center text-black">
23+
<div class="flex text-2xl font-bold justify-center">
2424
<slot name="header"></slot>
2525
</div>
2626

‎src/components/common/TaskCard.vue‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
v-if="data.labelInfo"
1111
:color="data.labelInfo.labelColor"
1212
:content="data.labelInfo.labelName" />
13-
<span class="text-black text-ellipsis overflow-hidden whitespace-nowrap">{{
14-
data.title
15-
}}</span>
13+
<span class="line-clamp-2">{{ data.title }}</span>
1614
</div>
1715
<CommonIcons
1816
v-if="draggable"
@@ -21,7 +19,7 @@
2119
<span class="text-xs text-body">{{ data.mainCategoryName }} - {{ data.categoryName }}</span>
2220
</div>
2321
<div class="flex justify-between items-end">
24-
<span class="text-xs font-bold text-black whitespace-nowrap overflow-hidden text-ellipsis">
22+
<span class="text-xs font-bold whitespace-nowrap overflow-hidden text-ellipsis">
2523
{{ data.taskCode }}
2624
</span>
2725
<div class="flex flex-col gap-1 items-end">
@@ -30,7 +28,7 @@
3028
<ImageContainer
3129
:url="data.requesterImageUrl"
3230
:size="16" />
33-
<span class="text-xs font-bold text-black">{{ data.requesterNickname }}</span>
31+
<span class="text-xs font-bold">{{ data.requesterNickname }}</span>
3432
</div>
3533
</div>
3634
</div>

‎src/components/common/TitleBar.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="flex justify-between items-center px-6 py-3 border-l-8 border-primary1">
3-
<span class="text-2xl font-bold text-black">{{ title }}</span>
3+
<span class="text-2xl font-bold">{{ title }}</span>
44
<div
55
v-if="$slots.button"
66
class="flex gap-2">

‎src/components/common/TitleContainer.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<template>
22
<div class="flex flex-col gap-2 items-center">
3-
<span class="text-4xl font-bold text-black whitespace-pre-wrap text-center leading-tight">{{
4-
title
5-
}}</span>
6-
<span class="font-bold whitespace-pre-wrap text-body text-center">{{ content }}</span>
3+
<span class="text-4xl font-bold whitespace-pre-wrap text-center leading-tight">
4+
{{ title }}
5+
</span>
6+
<span class="whitespace-pre-wrap text-body text-center">{{ content }}</span>
77
</div>
88
</template>
99

‎src/components/filters/FilterCategory.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
:class="
2222
(main as number[]).includes(category.id)
2323
? 'bg-primary1 text-white font-bold'
24-
: 'hover:bg-background-2 text-black'
24+
: 'hover:bg-background-2'
2525
"
2626
@click="() => onMainClick(category)">
2727
{{ category.name }}
@@ -34,7 +34,7 @@
3434
<div
3535
ref="subRef"
3636
class="filter-dropdown"
37-
:class="isDisabled ? 'bg-background-2 text-disabled' : 'text-black'"
37+
:class="isDisabled ? 'bg-background-2 text-disabled' : ''"
3838
@click="!isDisabled && toggleDropdown('sub')">
3939
<span class="grow text-center">선택</span>
4040
<CommonIcons
@@ -62,7 +62,7 @@
6262
:class="
6363
(sub as number[]).includes(subCategory.id)
6464
? 'bg-primary1 text-white font-bold'
65-
: 'hover:bg-background-2 text-black'
65+
: 'hover:bg-background-2'
6666
"
6767
@click="() => onSubClick(subCategory.id)">
6868
{{ subCategory.name }}

0 commit comments

Comments
 (0)