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 @@
-
+

비밀번호 재설정

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 @@
-
+

전화번호

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 @@
-
+

전화번호

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 @@
-
+

가입하신 아이디입니다.

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 @@
-
+

이메일

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 @@
-
+

전화번호

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 @@
-
+

현재 설정된 닉네임

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 @@
-
+

전화번호

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 @@
-
+

전화번호

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 @@
-
+

현재 비밀번호

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>
-
${item['music_name']!}
+
${item['music_name']!}
<#if item['base_yn'] == 'N'>
@@ -188,7 +188,7 @@ $(".list").append( "
" + - "
" + + "
" + "
" + "
삭제
" + "
" + diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css index 018260f..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 { @@ -14589,11 +14592,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{ @@ -15255,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 @@
-
기본음악 1
+
기본음악 1 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
음소거
-
기본음악 2
+
기본음악 2 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
음소거
-
기본음악 3
+
기본음악 3 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
음소거
-
기본음악 4
+
기본음악 4 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
음소거
-
기본음악 5
+
Waves Crashing on Rock Beach.mp3
음소거