g5 merge 충돌수정

2014-04-10 17:25:42 +09:00
parent 4340f6ad72 e28584cef7
commit 64e3027fbf
11 changed files with 15 additions and 28 deletions
--- a/css/default.css
+++ b/css/default.css
@ -266,6 +266,9 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
 #ctt_con {padding:10px 0}
 .ctt_img {text-align:center}

+/* 검색결과 색상 */
+.sch_word {color:#ff3061}
+
 /* 자바스크립트 alert 대안 */
 #validation_check {margin:100px auto;width:500px}
 #validation_check h1 {margin-bottom:20px;font-size:1.3em}
--- a/css/mobile.css
+++ b/css/mobile.css
@ -232,6 +232,9 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
 #ctt_con {padding:10px 0}
 .ctt_img {text-align:center}

+/* 검색결과 색상 */
+.sch_word {color:#ff3061}
+
 /* 사이드뷰 */
 .sv_wrap {display:inline-block;position:relative;font-weight:normal}
 .sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646}