g5 merge 충돌 수정

This commit is contained in:
chicpro
2014-02-14 13:41:49 +09:00
96 changed files with 1942 additions and 209 deletions

View File

@ -28,6 +28,13 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
#hd_wrapper {position:relative;margin:0 auto;padding:26px 0;width:970px;zoom:1}
#hd_wrapper:after {display:block;visibility:hidden;clear:both;content:""}
#hd_pop {z-index:1000;position:relative;margin:0 auto;width:1000px;height:0}
#hd_pop h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
.hd_pops {position:absolute;border:1px solid #e9e9e9;background:#fff}
.hd_pops_con {margin:0 0 30px}
.hd_pops_footer {position:absolute;bottom:0;left:0;padding:10px 0;width:100%;background:#000;color:#fff;text-align:right}
.hd_pops_footer button {margin-right:5px;padding:5px 10px;border:0;background:#393939;color:#fff}
#logo {float:left;padding:5px 0 0}
/* 전체 검색 */
@ -93,11 +100,14 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
#ft h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#ft p {margin:0;padding:10px 0;line-height:1.8em}
#ft_catch {position:relative;margin:0 auto;padding:20px 0;width:970px;text-align:center}
#ft_catch {position:relative;margin:0 auto;padding:20px 0 0;width:970px;text-align:center}
#ft_company {text-align:center}
#ft_copy {background:#414141}
#ft_copy p {position:relative;margin:0 auto;padding:10px 0;width:970px;color:#fff}
#ft_copy a {position:absolute;top:10px;right:0;color:#fff}
#ft_copy div {position:relative;margin:0 auto;padding:10px 0;width:970px;color:#fff}
#ft_copy a {display:inline-block;margin:0 10px 0 0;color:inherit}
#ft_copy #ft_totop {position:absolute;top:10px;right:0}
/* 게시물 선택복사 선택이동 */
#copymove {}
@ -239,7 +249,7 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.new_win .win_ul:after {display:block;visibility:hidden;clear:both;content:""}
.new_win .win_ul li {float:left;margin-left:-1px}
.new_win .win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #455255;border-left:1px solid #455255;color:#fff;font-family:dotum;font-weight:bold;text-decoration:none}
.new_win .win_desc {margin:0 20px}
.new_win .win_desc {padding:20px}
.new_win .win_btn {clear:both;padding:20px;text-align:center} /* 새창용 */
.new_win .win_btn button {display:inline-block;padding:0 10px;height:30px;border:0;background:#4b545e;color:#fff;line-height:2em;cursor:pointer}
@ -247,6 +257,29 @@ a.btn_admin:focus, a.btn_admin:hover {text-decoration:none}
.new_win .win_btn a {display:inline-block;padding:0 10px;height:30px;background:#4b545e;color:#fff;vertical-align:middle;line-height:2.4em}
.new_win .win_btn a:focus, .new_win .win_btn a:hover {text-decoration:none}
/* 내용관리 */
#ctt {margin:10px 0;padding:10px;border:1px solid #e9e9e9}
.ctt_admin {text-align:right}
#ctt header h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#ctt_con {padding:10px 0}
.ctt_img {text-align:center}
/* FAQ 관리 */
#faq_wrap {margin:10px 0}
#faq_wrap h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
.faq_admin {text-align:right}
#faq_wrap ol {margin:0;padding:0;list-style:none}
#faq_list {margin:0 0 10px;border:1px solid #ccc}
#faq_list li {border-bottom:1px solid #fff;background:#f2f5f9}
#faq_list a {display:block;padding:10px;font-weight:bold;text-decoration:none}
#faq_list a:focus, #faq_list a:hover {background:#626870;color:#fff}
#faq_con {border:1px solid #e9e9e9;border-top:0}
#faq_con li {padding:0 0 10px}
#faq_con h3 {padding:10px;background:#f2f5f9;border-top:1px solid #e9e9e9}
#faq_con #con_inner {padding:10px;line-height:1.8em}
.faq_tolist {padding:0 10px;text-align:right}
.faq_img {text-align:center}
/* 자바스크립트 alert 대안 */
#validation_check {margin:100px auto;width:500px}
#validation_check h1 {margin-bottom:20px;font-size:1.3em}