Skip to content

Commit 013a023

Browse files
authored
Merge pull request #211 from TaskFlow-CLAP/CLAP-482
Clap-482 정적파일 폴더구조 정리 및 작업 요청 후 flow수정
2 parents dbd89a4 + 71e3ec9 commit 013a023

32 files changed

+108
-140
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/assets/styles.css

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,15 +136,7 @@ body {
136136
.category-management-line {
137137
@apply flex items-center px-4 w-full h-11 border-b border-b-border-1;
138138
}
139-
.task-detail-dropdown {
140-
@apply flex w-full h-10 items-center text-sm rounded pl-4 pr-3 bg-white border border-border-1 cursor-pointer;
141-
}
142-
.task-detail-dropdown-option-list {
143-
@apply absolute w-full h-40 overflow-y-auto scrollbar-hide top-11 flex flex-col gap-2 p-2 bg-white rounded z-10 shadow border-t border-t-border-2;
144-
}
145-
.task-detail-dropdown-option {
146-
@apply w-full flex items-center h-10 p-2 rounded hover:bg-background-2 cursor-pointer;
147-
}
139+
148140
.task-detail-manager-dropdown {
149141
@apply flex w-full h-10 items-center rounded p-4 bg-white border border-border-1 cursor-pointer;
150142
}

src/components/common/ImageContainer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</template>
1111

1212
<script setup lang="ts">
13-
import defaultProfile from '@/assets/deafultProfile.png'
13+
import defaultProfile from '/deafultProfile.png'
1414
1515
const { url, size } = defineProps<{ url?: string; size: number }>()
1616
</script>

src/components/common/ModalView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ import { failIcon, successIcon, warningIcon } from '@/constants/iconPath'
9292
import { useIsOverlayOpenStore } from '@/stores/isOverlayOpen'
9393
import { onUnmounted, ref, watch } from 'vue'
9494
import CommonIcons from './CommonIcons.vue'
95-
import LoadingIcon from './LoadingIcon.vue'
95+
import LoadingIcon from '@/assets/icons/LoadingIcon.vue'
9696
9797
const { isOpen, type, modelValue, isEmpty } = defineProps<{
9898
isOpen: boolean

src/components/lists/ListBarTab.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
</template>
1919

2020
<script setup lang="ts">
21+
import OrderIcon from '@/assets/icons/OrderIcon.vue'
2122
import type { ListBarTabProps } from '@/types/common'
2223
import { computed } from 'vue'
23-
import OrderIcon from '../common/OrderIcon.vue'
2424
2525
const { content, width, sortBy, currentOrderRequest } = defineProps<ListBarTabProps>()
2626
defineEmits(['toggleSortBy'])

src/components/request-approve/LabelDropdown.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</div>
1717
<div
1818
v-if="dropdownOpen"
19-
class="absolute w-full h-40 overflow-y-auto scrollbar-hide top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow border-t border-t-border-2">
19+
class="absolute w-full h-40 overflow-y-auto scrollbar-hide top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow-custom">
2020
<div
2121
v-for="option in labelArr"
2222
:key="option.labelId || option.labelName"

src/components/request-task/CategoryDropDown.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</div>
3030
<div
3131
v-if="dropdownOpen"
32-
class="absolute w-full max-h-40 overflow-y-auto scrollbar-hide top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow border-t border-t-border-2">
32+
class="absolute w-full max-h-40 overflow-y-auto scrollbar-hide top-[52px] flex flex-col gap-2 p-2 bg-white rounded z-10 shadow-custom">
3333
<div
3434
v-for="option in options"
3535
:key="'subCategoryId' in option ? option.subCategoryId : option.mainCategoryId"

0 commit comments

Comments
 (0)