Merge branch 'master' of github.com:gnuboard/yc4s

css/default.css

@@ -35,7 +35,7 @@ a:active {color:#000;text-decoration:underline}
 #tnb {position:absolute;top:18px;right:0;margin:0;padding:0;list-style:none;zoom:1}
 #tnb:after {display:block;visibility:hidden;clear:both;content:""}
 #tnb li {float:left}
-#tnb a {display:block;padding:5px 10px;color:#333;letter-spacing:-0.1em}
+#tnb a {display:inline-block;padding:5px 10px;color:#333;letter-spacing:-0.1em;line-height:2em}
 #tnb a:focus, #tnb a:hover, #tnb a:active {text-decoration:none}
 #tnb img {margin-right:3px}
 
@@ -116,7 +116,7 @@ a:active {color:#000;text-decoration:underline}
 .cke_sc_def {margin:0 0 5px;padding:10px;border:1px solid #ccc;background:#f7f7f7;text-align:center}
 .cke_sc_def dl{margin:0 0 5px;text-align:left;zoom:1}
 .cke_sc_def dl:after {display:block;visibility:hidden;clear:both;content:""}
-.cke_sc_def dt, .cke_sc_def dd {float:left;margin:0;padding:5px 0;border-bottom:1px solid .e9e9e9}
+.cke_sc_def dt, .cke_sc_def dd {float:left;margin:0;padding:5px 0;border-bottom:1px solid #e9e9e9}
 .cke_sc_def dt {width:20%;font-weight:bold}
 .cke_sc_def dd {width:30%}
 

install/install_db.php

@@ -520,10 +520,6 @@ if($shop_install) {
     @copy('./logo_img', $data_path.'/common/logo_img');
     @copy('./logo_img', $data_path.'/common/mobile_logo_img');
     @copy('./main_img', $data_path.'/common/main_img');
-
-    @copy('./company_h', $data_path.'/content/company_h');
-    @copy('./privacy_h', $data_path.'/content/privacy_h');
-    @copy('./provision_h', $data_path.'/content/provision_h');
 }
 //-------------------------------------------------------------------------------------------------
 ?>

shop/orderform.php

@@ -908,13 +908,6 @@ function get_intall_file()
         새로고침(F5) 한후에도 계속 설치파일이 다운로드 되거나 결제가 되지 않으면 브라우저를 새로 열어서 주문해 주시기 바랍니다.<br>
         브라우저가 익스플로러가 아닌 경우 Payplus Plug-in 설치에 문제가 있을수 있음을 알려 드립니다.
     </p>
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-=======
->>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f
-=======
->>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f
     <div id="display_pay_button" class="btn_confirm" style="display:none">
         <input type="submit" value="주문하기" class="btn_submit">
         <a href="javascript:history.go(-1);" class="btn01">취소</a>
@@ -1586,8 +1579,4 @@ include_once('./_tail.php');
 
 <script>
 CheckPayplusInstall();
-<<<<<<< HEAD
+</script>
-</script>
-=======
-</script>
->>>>>>> 7c3b78792011aaf93dbbe968034d2ca094405b1f