g4s merge 충돌수정

2013-06-25 16:40:16 +09:00
parent 5cb1c0519e 5bc81f27a9
commit 5ca0975f21
7 changed files with 50 additions and 46 deletions
--- a/css/admin.css
+++ b/css/admin.css
@ -387,6 +387,9 @@ fieldset .btn_submit:focus {height:21px;background:#555;line-height:1.7em}
 /* 외부서비스 사이트코드 */
 .sitecode {display:inline-block;font:bold 15px 'Verdana';vertical-align:middle}

+/* 주의문구 */
+.str_caution {color:#ff3061}
+
 /* 폼 */
 label {vertical-align:middle}
 textarea, .frm_input {padding:2px;border:1px solid #ced9de;background:#f6f9fa;vertical-align:middle}