diff --git a/index.html b/index.html index a38b5d44..a35f738b 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,19 @@ - + - - - - TaskFlow + + + + TaskFlow - 스마트한 업무 관리
- + diff --git a/src/assets/fonts/SUIT-Variable.woff2 b/src/assets/fonts/SUIT-Variable.woff2 new file mode 100644 index 00000000..89d7e4c2 Binary files /dev/null and b/src/assets/fonts/SUIT-Variable.woff2 differ diff --git a/src/assets/styles.css b/src/assets/styles.css index 9da13117..7bcd0438 100644 --- a/src/assets/styles.css +++ b/src/assets/styles.css @@ -4,9 +4,12 @@ @font-face { font-family: 'SUIT-Variable'; - src: url('@/assets/fonts/SUIT-Variable.ttf') format('truetype'); - font-weight: normal; + src: + url('@/assets/fonts/SUIT-Variable.woff2') format('woff2'), + url('@/assets/fonts/SUIT-Variable.ttf') format('truetype'); + font-weight: 100 900; font-style: normal; + font-display: swap; } body { @@ -108,10 +111,10 @@ body { } .request-task-dropdown { - @apply flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black; + @apply flex w-full h-11 items-center rounded p-4 bg-white border border-border-1 cursor-pointer; } .request-task-dropdown-option-list { - @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; + @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; } .request-task-dropdown-option { @apply w-full flex items-center h-11 p-2 rounded hover:bg-background-2 cursor-pointer; @@ -140,7 +143,7 @@ body { @apply w-full flex items-center h-10 p-2 rounded hover:bg-background-2 cursor-pointer; } .task-detail-manager-dropdown { - @apply flex w-full h-10 items-center rounded p-4 bg-white border border-border-1 cursor-pointer text-black; + @apply flex w-full h-10 items-center rounded p-4 bg-white border border-border-1 cursor-pointer; } .modal-enter-active, diff --git a/src/components/common/EditInformation.vue b/src/components/common/EditInformation.vue index b7f7827e..93d5afeb 100644 --- a/src/components/common/EditInformation.vue +++ b/src/components/common/EditInformation.vue @@ -4,7 +4,7 @@ :isOpen="isModalVisible" :type="'successType'" @close="handleCancel"> - + - - + +
@@ -51,7 +51,7 @@ {{ name.length }} / 10

아이디

-

{{ info.nickname }}

+

{{ info.nickname }}

이메일

-

{{ info.email }}

+

{{ info.email }}

부서

-

{{ info.departmentName }}

+

{{ info.departmentName }}

직무

-

{{ info.departmentRole }}

+

{{ info.departmentRole }}

알림 수신 여부

diff --git a/src/components/common/FormCheckbox.vue b/src/components/common/FormCheckbox.vue index 081663a1..8ad176fa 100644 --- a/src/components/common/FormCheckbox.vue +++ b/src/components/common/FormCheckbox.vue @@ -14,7 +14,7 @@ { 'bg-primary1 text-white': isChecked, 'border border-disabled': !isChecked } ]" :style="isChecked ? { fill: 'white' } : {}" /> -

{{ checkButtonName }}

+

{{ checkButtonName }}

diff --git a/src/components/common/ModalView.vue b/src/components/common/ModalView.vue index 45e16927..b36f62e2 100644 --- a/src/components/common/ModalView.vue +++ b/src/components/common/ModalView.vue @@ -20,7 +20,7 @@ v-if="type == 'warningType'" :name="warningIcon" /> -
+
diff --git a/src/components/common/TaskCard.vue b/src/components/common/TaskCard.vue index 11d66908..c7484113 100644 --- a/src/components/common/TaskCard.vue +++ b/src/components/common/TaskCard.vue @@ -10,9 +10,7 @@ v-if="data.labelInfo" :color="data.labelInfo.labelColor" :content="data.labelInfo.labelName" /> - {{ - data.title - }} + {{ data.title }}
{{ data.mainCategoryName }} - {{ data.categoryName }}
- + {{ data.taskCode }}
@@ -30,7 +28,7 @@ - {{ data.requesterNickname }} + {{ data.requesterNickname }}
diff --git a/src/components/common/TitleBar.vue b/src/components/common/TitleBar.vue index a28382af..513b5d59 100644 --- a/src/components/common/TitleBar.vue +++ b/src/components/common/TitleBar.vue @@ -1,6 +1,6 @@ diff --git a/src/components/filters/FilterIpAddress.vue b/src/components/filters/FilterIpAddress.vue index 3e44c19d..1642a179 100644 --- a/src/components/filters/FilterIpAddress.vue +++ b/src/components/filters/FilterIpAddress.vue @@ -1,8 +1,7 @@ diff --git a/src/components/request-task/RequestTaskDropdown.vue b/src/components/request-task/RequestTaskDropdown.vue index 42325ab6..c701be6b 100644 --- a/src/components/request-task/RequestTaskDropdown.vue +++ b/src/components/request-task/RequestTaskDropdown.vue @@ -11,7 +11,7 @@

{{ modelValue || placeholderText }} @@ -22,7 +22,7 @@

+ class="absolute w-full h-40 overflow-y-auto top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow border-t border-t-border-2">
+ class="flex w-full justify-between items-center h-8 text-xs border-b border-b-border-2 px-4 shrink-0">

{{ file.name }}

{{ formatFileSize(file.size) }}

diff --git a/src/components/request-task/RequestTaskInput.vue b/src/components/request-task/RequestTaskInput.vue index 6bb85033..7220634f 100644 --- a/src/components/request-task/RequestTaskInput.vue +++ b/src/components/request-task/RequestTaskInput.vue @@ -14,12 +14,12 @@

- {{ title }} + {{ title }} diff --git a/src/components/statistics/StatisticsCategoryCard.vue b/src/components/statistics/StatisticsCategoryCard.vue index 86419887..0e2ae84d 100644 --- a/src/components/statistics/StatisticsCategoryCard.vue +++ b/src/components/statistics/StatisticsCategoryCard.vue @@ -2,7 +2,7 @@
- 카테고리별 작업 요청량 + 카테고리별 작업 요청량 diff --git a/src/components/task-detail/TaskDetailDropdown.vue b/src/components/task-detail/TaskDetailDropdown.vue index 7db88f7d..69747c3d 100644 --- a/src/components/task-detail/TaskDetailDropdown.vue +++ b/src/components/task-detail/TaskDetailDropdown.vue @@ -11,7 +11,7 @@ src="/images/mockProfile.jpg" alt="userProfile" />
-

+

{{ modelValue }}

diff --git a/src/components/task-detail/TaskDetailFiles.vue b/src/components/task-detail/TaskDetailFiles.vue index 480b9eb1..d09dd64c 100644 --- a/src/components/task-detail/TaskDetailFiles.vue +++ b/src/components/task-detail/TaskDetailFiles.vue @@ -2,7 +2,7 @@
-

파일명

+

파일명

용량

최종 업로드 시각

@@ -15,7 +15,7 @@
+ class="flex w-full justify-between items-center h-8 text-xs border-b border-b-border-2 px-4 shrink-0">

{{ file.fileName }}

{{ file.fileSize }}

diff --git a/src/components/task-detail/TaskDetailHistoryChat.vue b/src/components/task-detail/TaskDetailHistoryChat.vue index 9b3dbeb5..7905ec64 100644 --- a/src/components/task-detail/TaskDetailHistoryChat.vue +++ b/src/components/task-detail/TaskDetailHistoryChat.vue @@ -17,7 +17,7 @@

{{ history.details.commentDetails?.nickName }}

{{ history.details.commentDetails?.comment }} @@ -38,7 +38,7 @@ v-if="isClicked" @click="deleteCommentText" :class="[ - 'absolute shadow-custom bottom-0 w-20 h-7 flex items-center justify-center text-xs text-red-1 bg-white hover:bg-background-1', + 'absolute shadow-custom bottom-0 w-20 h-7 flex items-center justify-center text-xs text-red-1 bg-white hover:bg-background-2 rounded', isProcessor ? 'right-6' : 'left-6' ]"> 삭제 diff --git a/src/components/task-detail/TaskDetailHistoryFile.vue b/src/components/task-detail/TaskDetailHistoryFile.vue index 3ce17c18..fa04ed3f 100644 --- a/src/components/task-detail/TaskDetailHistoryFile.vue +++ b/src/components/task-detail/TaskDetailHistoryFile.vue @@ -9,7 +9,7 @@

{{ history.details.commentFileDetails?.nickName }}