From 6d57bb20cfb01b431dfec3ff9578217a4b423f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=A0=95=EC=9D=B4=EC=86=94?= <isol2011@imcloud.co.kr>
Date: Sat, 30 Apr 2022 14:35:07 +0900
Subject: [PATCH 1/3] =?UTF-8?q?ftl=20=EC=88=98=EC=A0=95=20-=20=EC=A4=91?=
 =?UTF-8?q?=EC=B2=A9=20margin=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl | 2 +-
 src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_01.ftl   | 2 +-
 src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl   | 2 +-
 .../webapp/WEB-INF/views/ftl/m/login/view_find_id_result.ftl    | 2 +-
 .../webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email_02.ftl | 2 +-
 .../webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl | 2 +-
 .../WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl    | 2 +-
 .../views/ftl/m/member_env/view_set_account_phone_02.ftl        | 2 +-
 .../views/ftl/m/member_env/view_set_account_phone_confirm.ftl   | 2 +-
 .../WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl      | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl
index 52e0f8d..c963c86 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_change_account_pw.ftl
@@ -13,7 +13,7 @@
 		<input type="hidden" id="email" name="email" value="${model['email']!}">
 
 		<div id="search_id" class="search_id">
-			<div class="search_phone">
+			<div>
 				<h3>비밀번호 재설정</h3>
 				<div style="padding-bottom: 15px" class="input_search_phone">
 					<input type="password" maxlength="15" id="password_1" name="password_1" value="" class="input_box" placeholder="영문/숫자/특수문자2조합 9~15자 이내로 작성해주세요." />
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_01.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_01.ftl
index a448308..85748d3 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_01.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_01.ftl
@@ -13,7 +13,7 @@
 
   <!-- search_id -->
   <div id="search_id" class="search_id">
-    <div class="search_phone">
+    <div>
       <p>전화번호</p>
       <div class="input_search_phone">
         <input type="text" maxlength="15" onkeyup="this.value = phone_mask(this.value)" id="phone" name="phone" value="" placeholder="가입 시 사용한 전화번호를 입력하세요.(숫자만 가능)" class="input_box" />
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl
index 751f440..1b39da8 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_02.ftl
@@ -14,7 +14,7 @@
 
   <!-- search_id -->
   <div id="search_id" class="search_id">
-    <div class="search_phone">
+    <div>
       <h3>전화번호</h3>
       <div class="input_search_phone">
         <input readonly type="number" id="phone" name="phone" value="${model['phone_num']}" class="input_box" />
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_result.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_result.ftl
index fd85b4a..99a6acc 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_result.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_find_id_result.ftl
@@ -13,7 +13,7 @@
 
   <!-- search_id -->
   <div id="search_id" class="search_id">
-    <div class="search_phone">
+    <div>
       <p>가입하신 아이디입니다.</p>
       <div class="input_search_phone">
         <input readonly type="text" id="email" name="email" value="${model['email']}" class="input_box" />
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email_02.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email_02.ftl
index 80868c3..ba2e712 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email_02.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_email_02.ftl
@@ -10,7 +10,7 @@
     </header>
 
 	<div id="search_id" class="search_id">
-		<div class="search_phone">
+		<div>
 			<h3>이메일</h3>
 			<div class="input_search_phone">
 				<input readonly type="text" id="email" name="email" value="${model['email']}" class="input_box" />
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl
index af37517..c747a6c 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_pw_reset_phone_02.ftl
@@ -14,7 +14,7 @@
 
 	<!-- search_id -->
 	<div id="search_id" class="search_id">
-		<div class="search_phone">
+		<div>
 			<h3>전화번호</h3>
 			<div class="input_search_phone">
 				<input readonly type="number" id="phone" name="phone" value="${model['phone_num']}" class="input_box" />
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl
index 0b05789..1a13585 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_name.ftl
@@ -9,7 +9,7 @@
 		</header>
 		<form name="frmMember" id="frmMember" method="post">
 			<div id="search_id" class="search_id">
-				<div class="search_phone">
+				<div>
 					<h3>현재 설정된 닉네임</h3>
 					<div class="input_search_phone">
 						<input readonly type="text" id="nickname_now" name="nickname_now" value="<#if Session.rm_member?has_content>${Session.rm_member['nickname']!}</#if>" class="input_box" />
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_02.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_02.ftl
index 76b17dc..40abcd2 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_02.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_02.ftl
@@ -13,7 +13,7 @@
 	<!-- search_id -->
 	<div id="search_id" class="search_id">
 
-		<div class="search_phone">
+		<div>
 			<h3>전화번호</h3>
 			<div class="input_search_phone">
 				<input readonly type="number" id="phone" name="phone" value="${model['phone']}" class="input_box" />
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_confirm.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_confirm.ftl
index d400488..96c899f 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_confirm.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_phone_confirm.ftl
@@ -14,7 +14,7 @@
 	<div id="search_id" class="search_id">
 		<input type="hidden" id="s_no" value="${model['s_no']}">
 
-		<div class="search_phone">
+		<div>
 			<h3>전화번호</h3>
 			<div class="input_search_phone">
 				<input readonly type="number" id="phone" name="phone" value="${model['phone_num']}" class="input_box" />
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl
index 76e5ebb..d91cb88 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_account_pw.ftl
@@ -10,7 +10,7 @@
 
 		<form name="frmMember" id="frmMember" method="post">
 			<div id="search_id" class="search_id">
-				<div class="search_phone">
+				<div>
 					<h3>현재 비밀번호</h3>
 					<div class="input_search_phone">
 						<input type="password" id="password_now" name="password_now" value="" maxlength="15" placeholder="현재 비밀번호를 입력해 주세요." class="input_box" />

From c0bb0461d4a36bd981d4f9f139dd7e6b833f495d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=A0=95=EC=9D=B4=EC=86=94?= <isol2011@imcloud.co.kr>
Date: Sat, 30 Apr 2022 14:49:35 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=ED=8D=BC=EB=B8=94=EB=A6=AC=EC=8B=B1=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20-=20=EA=B8=B0=EB=A1=9D=EB=8B=A8=20?=
 =?UTF-8?q?=EC=9E=91=EC=9D=80=ED=99=94=EB=A9=B4=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=ED=8F=B0=ED=8A=B8=20=EC=9D=B4=ED=83=88=EB=AC=B8=EC=A0=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/m/css/style.css | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css
index 018260f..62bcaca 100644
--- a/src/main/webapp/m/css/style.css
+++ b/src/main/webapp/m/css/style.css
@@ -14589,11 +14589,13 @@ main.sona_cont_measurement {
     height: 30px;
     color: #fff;
     background: #C3C3C3;
-    font-size: 14px;
-    line-height: 30px;
-    padding:0 15px;
+    font-size: 0.7rem;
+    line-height: 0.8rem;
+    padding:0 0.3rem;
     border-radius: 20px;
     margin-bottom: 10px;
+    display: flex;
+    align-items: center;
 }
 
 .snack_input .flex{

From 1ef5f3ada1fed6466710f074bedd30d148413bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=A0=95=EC=9D=B4=EC=86=94?= <isol2011@imcloud.co.kr>
Date: Sat, 30 Apr 2022 16:12:45 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=ED=8D=BC=EB=B8=94=EB=A6=AC=EC=8B=B1,=20ftl?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95=20-=20=EC=9D=8C=EC=95=85=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EC=9D=B4=EB=A6=84=EC=9D=B4=201=EC=A4=84=EC=9D=B4?=
 =?UTF-8?q?=20=EB=84=98=EC=9D=84=20=EB=95=8C=20UI=20=EA=B9=A8=EC=A7=80?=
 =?UTF-8?q?=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/ftl/m/member_env/view_set_music.ftl  |  4 ++--
 src/main/webapp/m/css/style.css                        |  8 +++++++-
 .../m/html/setting/8-14.설정하기-음악설정.html | 10 +++++-----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
index a385bf7..56f4c6b 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_music.ftl
@@ -23,7 +23,7 @@
 							<#list model['music_list'] as item>
 								<div name="list_item" class="item_order flex_box">
 									<input type="hidden" name="music_list" value="/bf/upload/${item['music_file_path']!}">
-									<div>${item['music_name']!}</div>
+									<div class="select_music">${item['music_name']!}</div>
 
 									<#if item['base_yn'] == 'N'>
 									<div class='btn_cont'>
@@ -188,7 +188,7 @@
 
 		$(".list").append(
 				"<div name='list_item' class='item_order flex_box'>" +
-				"	<div><input type='file' accept='audio/*' onchange='fn_M_my_fileSave(this);' name='file'></div>" +
+				"	<div class='select_music'><input type='file' accept='audio/*' onchange='fn_M_my_fileSave(this);' name='file'></div>" +
 				"   <div>" +
 				"		<div class='btn' onclick='fncRemove(this);'>삭제</div>" +
 				"	</div>" +
diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css
index 62bcaca..dc599fd 100644
--- a/src/main/webapp/m/css/style.css
+++ b/src/main/webapp/m/css/style.css
@@ -4694,7 +4694,10 @@ main {
 }
 
 .item_order .select_music {
-    width: 15rem;
+    flex: 1;
+    border: 1px solid;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
 .item_add {
@@ -15257,6 +15260,9 @@ main.sona_cont_measurement {
     margin-bottom: 5px;
 }
 
+/* 8-14.설정하기-음악설정 */
+{}
+
 /* 8-15.설정하기-카테고리수정 */
 .m_set_recode_order {
     padding: 15px 15px 0;
diff --git a/src/main/webapp/m/html/setting/8-14.설정하기-음악설정.html b/src/main/webapp/m/html/setting/8-14.설정하기-음악설정.html
index 613afb7..c9b67e8 100644
--- a/src/main/webapp/m/html/setting/8-14.설정하기-음악설정.html
+++ b/src/main/webapp/m/html/setting/8-14.설정하기-음악설정.html
@@ -29,27 +29,27 @@
                         <div id="word_list">
                             <div class="set_list_wrap list">
                                 <div name="list_item" class="item_order flex_box">
-                                    <div>기본음악 1</div>
+                                    <div class="select_music">기본음악 1 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</div>
                                     <input type="hidden" name="record_list" value="${item['cd_no']!}">
                                     <div class="btn" onclick="">음소거</div>
                                 </div>
                                 <div name="list_item" class="item_order flex_box">
-                                    <div>기본음악 2</div>
+                                    <div class="select_music">기본음악 2 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</div>
                                     <input type="hidden" name="record_list" value="${item['cd_no']!}">
                                     <div class="btn" onclick="">음소거</div>
                                 </div>
                                 <div name="list_item" class="item_order flex_box">
-                                    <div>기본음악 3</div>
+                                    <div class="select_music">기본음악 3 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</div>
                                     <input type="hidden" name="record_list" value="${item['cd_no']!}">
                                     <div class="btn" onclick="">음소거</div>
                                 </div>
                                 <div name="list_item" class="item_order flex_box">
-                                    <div>기본음악 4</div>
+                                    <div class="select_music">기본음악 4 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa</div>
                                     <input type="hidden" name="record_list" value="${item['cd_no']!}">
                                     <div class="btn" onclick="">음소거</div>
                                 </div>
                                 <div name="list_item" class="item_order flex_box">
-                                    <div>기본음악 5</div>
+                                    <div class="select_music">Waves Crashing on Rock Beach.mp3</div>
                                     <input type="hidden" name="record_list" value="${item['cd_no']!}">
                                     <div class="btn" onclick="">음소거</div>
                                 </div>