Merge branch 'master' into 5102_친구톡_발송속도_개선
@6da46e1c0ec33c2a368e1bbe298108bb88e1557e
--- src/main/resources/egovframework/egovProps/globals_local.properties
+++ src/main/resources/egovframework/egovProps/globals_local.properties
... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 |
|
| 29 | 29 |
# mysql |
| 30 | 30 |
Globals.DriverClassName=com.mysql.jdbc.Driver |
| 31 |
-Globals.Url=jdbc:mysql://119.193.215.98:3306/mjon |
|
| 31 |
+Globals.Url=jdbc:mysql://192.168.0.125:3306/mjon |
|
| 32 | 32 |
#Globals.Url=jdbc:mysql://192.168.0.60:3308/mjon |
| 33 | 33 |
Globals.UserName= mjonUr |
| 34 | 34 |
Globals.Password= mjon!@#$ |
--- src/main/webapp/publish/js/content.js
+++ src/main/webapp/publish/js/content.js
... | ... | @@ -1452,7 +1452,7 @@ |
| 1452 | 1452 |
}); |
| 1453 | 1453 |
} else if (t > ofsT) {
|
| 1454 | 1454 |
$('.send_top .send_right .phone').css({
|
| 1455 |
- 'top': h - pH + 100, |
|
| 1455 |
+ 'top': h - pH + 30, |
|
| 1456 | 1456 |
'transition': 'all 0.2s' |
| 1457 | 1457 |
}); |
| 1458 | 1458 |
} else if (t <= ofsT) {
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?