Commit @b6282abe1417ee97acc0573915f2d1a58cd93cf4

b6282ab

client/resources/img/content/ico_folder.svg (added)

+++ client/resources/img/content/ico_folder.svg

...	...	@@ -0,0 +1,3 @@
	1	+<svg width="22" height="23" viewBox="0 0 22 23" fill="none" xmlns="http://www.w3.org/2000/svg">
	2	+<path d="M11.3797 5.08333H19.25C19.7563 5.08333 20.1667 5.49374 20.1667 6V18.8333C20.1667 19.3396 19.7563 19.75 19.25 19.75H2.75004C2.24378 19.75 1.83337 19.3396 1.83337 18.8333V4.16667C1.83337 3.66041 2.24378 3.25 2.75004 3.25H9.54639L11.3797 5.08333ZM3.66671 5.08333V17.9167H18.3334V6.91667H10.6204L8.78701 5.08333H3.66671ZM7.87525 13.1582C7.8186 12.9195 7.78862 12.6706 7.78862 12.4146C7.78862 12.1587 7.81859 11.9098 7.87523 11.6712L6.96669 11.1467L7.88291 9.55974L8.79209 10.0847C9.15226 9.74394 9.5914 9.48585 10.0792 9.34068V8.29167H11.9116V9.34068C12.3993 9.48584 12.8385 9.74394 13.1987 10.0846L14.1079 9.55965L15.0242 11.1466L14.1155 11.6711C14.1722 11.9097 14.2021 12.1587 14.2021 12.4146C14.2021 12.6706 14.1722 12.9195 14.1155 13.1581L15.0242 13.6827L14.108 15.2696L13.1988 14.7446C12.8386 15.0854 12.3994 15.3434 11.9117 15.4886V16.5376H10.0792V15.4887C9.59149 15.3435 9.15235 15.0855 8.79217 14.7447L7.88295 15.2697L6.96669 13.6828L7.87525 13.1582ZM10.9954 13.789C11.7544 13.789 12.3697 13.1736 12.3697 12.4146C12.3697 11.6557 11.7544 11.0403 10.9954 11.0403C10.2364 11.0403 9.6211 11.6557 9.6211 12.4146C9.6211 13.1736 10.2364 13.789 10.9954 13.789Z" fill="black"/>
	3	+</svg>

b6282ab

client/resources/img/content/ico_user.svg (added)

+++ client/resources/img/content/ico_user.svg

...	...	@@ -0,0 +1,3 @@
	1	+<svg width="20" height="21" viewBox="0 0 20 21" fill="none" xmlns="http://www.w3.org/2000/svg">
	2	+<path d="M10 20.5C4.47715 20.5 0 16.0228 0 10.5C0 4.97715 4.47715 0.5 10 0.5C15.5228 0.5 20 4.97715 20 10.5C20 16.0228 15.5228 20.5 10 20.5ZM10 6.5C10.5523 6.5 11 6.94772 11 7.5C11 8.05228 10.5523 8.5 10 8.5C9.4477 8.5 9 8.05228 9 7.5C9 6.94772 9.4477 6.5 10 6.5ZM10 10.5C11.6569 10.5 13 9.1569 13 7.5C13 5.84315 11.6569 4.5 10 4.5C8.3431 4.5 7 5.84315 7 7.5C7 9.1569 8.3431 10.5 10 10.5ZM10 13.5C11.1046 13.5 12 14.3954 12 15.5H14C14 13.2909 12.2091 11.5 10 11.5C7.79086 11.5 6 13.2909 6 15.5H8C8 14.3954 8.8954 13.5 10 13.5Z" fill="#85898C"/>
	3	+</svg>

da056a2

b6282ab

client/resources/scss/admin/content.scss

--- client/resources/scss/admin/content.scss

+++ client/resources/scss/admin/content.scss


             }
         }
     }
+    .ico-sch{
+        position: absolute;
+        top: 50%;
+        right: 1rem;
+        transform: translateY(-50%);
+    }
 }
 
 

da056a2

b6282ab

client/views/layout/Header.vue

--- client/views/layout/Header.vue

+++ client/views/layout/Header.vue


             <span><img :src="selectedIcon" :alt="selectedLabel + ' 아이콘'" style="width:20px; height:20px;" /></span>
             <span style="font-weight: bold;">{{ selectedLabel }}</span>
         </div>
-        <div class="user-info">
-            <div class="user-name">관리자</div>
+        <div class="user-info gap10">
+            <div class="user-name"><img src="../../resources/img/content/ico_user.svg" alt="" style="vertical-align: middle;"> 관리자</div>
             <button class="user-logout"><img src="../../resources/img/component/common/ico_logout_w_16.svg" alt="" style="color: #ffffff;"> 로그아웃</button>
         </div>
     </header>

da056a2

b6282ab

client/views/pages/subPage/Asset.vue

--- client/views/pages/subPage/Asset.vue

+++ client/views/pages/subPage/Asset.vue


   <div class="project-container">
     <div class="top-zone mb30">
         <div class="search-zone" style="background-color: #dfe5f3;">
-          <input type="text" class="form-control sm" style="border: 0;" placeholder="제목을 입력해주세요">
+          <div style="position: relative;">
+            <input type="text" class="form-control sm" style="border: 0;" placeholder="제목을 입력해주세요">
+            <button class="btn-ico sm ico-after ico-sch"></button>
+          </div>
         </div>
         <div class="layout center justify-end gap10">
           <select name="" id="" class="form-select sm" style="border: 0; width: 200px;">
             <option value="">최근 수정순</option>
           </select>
-          <button class="btn sm" style="background-color: #f4d01e;border: #f4d01e;">폴더</button>
+          <button class="btn sm" style="background-color: #f4d01e;border: #f4d01e;"><img src="../../../resources/img/content/ico_folder.svg" alt="" style="vertical-align: middle;">폴더</button>
         </div>
     </div>
     <div class="bottom-zone">

da056a2

b6282ab

client/views/pages/subPage/Modeling.vue

--- client/views/pages/subPage/Modeling.vue

+++ client/views/pages/subPage/Modeling.vue


                                 <div class="modal-content">
                                     <p class="modeling-title">{{ activeModalTool.title }}</p>
                                     <div class="modeling-content">
-                                        <ul v-if="activeModalTool.title === '참여자'">
+                                        <ul v-if="activeModalTool.title === '참여자'" class="mb10">
                                             <li>참여자1</li>
                                             <li>참여자1</li>
                                             <li>참여자1</li>
                                             <li>참여자1</li>
                                         </ul>
-                                        <div v-else-if="activeModalTool.title === '코멘트'">
+                                        <div v-else-if="activeModalTool.title === '코멘트'" class="mb10">
                                             <div class="input-group mb10">
                                                 <label for="">writer</label>
                                                 <input type="text" class="form-control sm" disabled>

                                                 <textarea  class="form-control sm"></textarea>
                                             </div>
                                         </div>
+                                        <div class="btn-group layout center justify-center gap10">
+                                            <button class="btn sm black" v-if="activeModalTool.title === '참여자'" @click="closeModal">닫기</button>
+                                            <button class="btn sm purple" v-if="activeModalTool.title === '코멘트'">저장</button>
+                                            <button class="btn sm black" v-if="activeModalTool.title === '코멘트'" @click="closeModal">취소</button>
+                                        </div>
                                     </div>
                                 </div>
                             </div>

...	...	@@ -496,6 +496,12 @@
496	496	}
497	497	}
498	498	}
	499	+ .ico-sch{
	500	+ position: absolute;
	501	+ top: 50%;
	502	+ right: 1rem;
	503	+ transform: translateY(-50%);
	504	+ }
499	505	}
500	506
501	507

...	...	@@ -2,13 +2,16 @@
2	2	<div class="project-container">
3	3	<div class="top-zone mb30">
4	4	<div class="search-zone" style="background-color: #dfe5f3;">
5		- <input type="text" class="form-control sm" style="border: 0;" placeholder="제목을 입력해주세요">
	5	+ <div style="position: relative;">
	6	+ <input type="text" class="form-control sm" style="border: 0;" placeholder="제목을 입력해주세요">
	7	+ <button class="btn-ico sm ico-after ico-sch"></button>
	8	+ </div>
6	9	</div>
7	10	<div class="layout center justify-end gap10">
8	11	<select name="" id="" class="form-select sm" style="border: 0; width: 200px;">
9	12	<option value="">최근 수정순</option>
10	13	</select>
11		- <button class="btn sm" style="background-color: #f4d01e;border: #f4d01e;">폴더</button>
	14	+ <button class="btn sm" style="background-color: #f4d01e;border: #f4d01e;"><img src="../../../resources/img/content/ico_folder.svg" alt="" style="vertical-align: middle;">폴더</button>
12	15	</div>
13	16	</div>
14	17	<div class="bottom-zone">

...	...	@@ -85,13 +85,13 @@
85	85	<div class="modal-content">
86	86	<p class="modeling-title">{{ activeModalTool.title }}</p>
87	87	<div class="modeling-content">
88		- <ul v-if="activeModalTool.title === '참여자'">
	88	+ <ul v-if="activeModalTool.title === '참여자'" class="mb10">
89	89	<li>참여자1</li>
90	90	<li>참여자1</li>
91	91	<li>참여자1</li>
92	92	<li>참여자1</li>
93	93	</ul>
94		- <div v-else-if="activeModalTool.title === '코멘트'">
	94	+ <div v-else-if="activeModalTool.title === '코멘트'" class="mb10">
95	95	<div class="input-group mb10">
96	96	<label for="">writer</label>
97	97	<input type="text" class="form-control sm" disabled>
...	...	@@ -105,6 +105,11 @@
105	105	<textarea class="form-control sm"></textarea>
106	106	</div>
107	107	</div>
	108	+ <div class="btn-group layout center justify-center gap10">
	109	+ <button class="btn sm black" v-if="activeModalTool.title === '참여자'" @click="closeModal">닫기</button>
	110	+ <button class="btn sm purple" v-if="activeModalTool.title === '코멘트'">저장</button>
	111	+ <button class="btn sm black" v-if="activeModalTool.title === '코멘트'" @click="closeModal">취소</button>
	112	+ </div>
108	113	</div>
109	114	</div>
110	115	</div>

Delete comment