Merge branch 'master' into 5102_친구톡_발송속도_개선

src/main/resources/egovframework/egovProps/globals_local.properties

@@ -28,7 +28,7 @@ Globals.Env = local
 
 # mysql
 Globals.DriverClassName=com.mysql.jdbc.Driver
-Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon
+Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon
 #Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon
 Globals.UserName= mjonUr
 Globals.Password= mjon!@#$

src/main/webapp/publish/js/content.js

@@ -1452,7 +1452,7 @@ function sendPhoneFixed() {
 					});
 				} else if (t > ofsT) {
 					$('.send_top .send_right .phone').css({
-						'top': h - pH + 100,
+						'top': h - pH + 30,
 						'transition': 'all 0.2s'
 					});
 				} else if (t <= ofsT) {