g4s merge 충돌 수정

This commit is contained in:
chicpro
2013-05-24 09:06:49 +09:00
28 changed files with 58 additions and 34 deletions

View File

@ -28,7 +28,7 @@ a:active {color:#000;text-decoration:underline}
/* 전체 검색 */
#sch_all {position:absolute;top:22px;left:70px;margin:0;padding:0;border:1px solid #555}
#sch_all legend {position:absolute;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
#sch_all legend {position:absolute;margin:0;padding:0;font-size:0;line-height:0;text-indent:-9999em;overflow:hidden}
#sch_all_stx {padding-left:5px;width:165px;height:24px;border:0;background:#fff;line-height:1.9em !important;line-height:1.6em}
#sch_all_submit {padding:0 5px;height:26px;border:0;background:#555;color:#fff}
@ -79,7 +79,7 @@ a:active {color:#000;text-decoration:underline}
/* 텍스트 크기 조절 */
#text_size {position:absolute;top:-33px;left:-1px;letter-spacing:-3px}
#text_size button {margin:0;padding:0 10px;height:28px;border:0;background:#555;color:#fff;vertical-align:middle;cursor:pointer}
#text_size button {margin:0;padding:0 10px;height:28px;border:0;background:#555;color:#fff;vertical-align:middle;letter-spacing:0;cursor:pointer}
#text_size_down {font-size:0.9em}
#text_size_def {font-size:1em}
#text_size_up {font-size:1.3em}
@ -137,8 +137,9 @@ button.btn_cancel {display:inline-block;padding:0 10px;height:24px;border:1px so
.btn_frmline {display:inline-block;padding:0 7px 0 5px;height:22px;border:0;background:#333;color:#fff !important;letter-spacing:-0.1em;text-decoration:none;vertical-align:top;line-height:2em} /* 우편번호검색버튼 등 */
button.btn_frmline {font-size:1em}
.btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
.btn_win input {height:30px;line-height:2em}
.btn_win a {display:inline-block;padding:0 10px;height:28px;border:1px solid #ccc;background:#fafafa;vertical-align:top;line-height:2.4em}
.btn_win a {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em;cursor:pointer}
.btn_win a:focus, .btn_win a:hover {text-decoration:none}
/* 게시판용 버튼 */