g5 merge 충돌 수정

skin/board/basic/style.css

@@ -207,7 +207,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
 #bo_v_atc {min-height:200px;height:auto !important;height:200px}
 #bo_v_atc_title {position:absolute;font-size:0;line-height:0;overflow:hidden}
 
-#bo_v_img {margin:0 0 10px;width:100%;overflow:hidden:zoom:1}
+#bo_v_img {margin:0 0 10px;width:100%;overflow:hidden;zoom:1}
 #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_v_img img {margin-bottom:20px;max-width:100%;height:auto}
 

skin/board/gallery/list.skin.php

@@ -44,6 +44,9 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
     <input type="hidden" name="page" value="<?php echo $page ?>">
     <input type="hidden" name="sw" value="">
 
+    <label for="chkall" class="sound_only">현재 페이지 게시물 전체</label>
+    <input type="checkbox" id="chkall" onclick="if (this.checked) all_checked(true); else all_checked(false);">
+
     <ul id="gall_ul">
         <?php for ($i=0; $i<count($list); $i++) {
             if($i>0 && ($i % $bo_gallery_cols == 0))

skin/board/gallery/style.css

@@ -197,7 +197,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
 #bo_v_atc {min-height:200px;height:auto !important;height:200px}
 #bo_v_atc_title {position:absolute;font-size:0;line-height:0;overflow:hidden}
 
-#bo_v_img {margin:0 0 10px;width:100%;overflow:hidden:zoom:1}
+#bo_v_img {margin:0 0 10px;width:100%;overflow:hidden;zoom:1}
 #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_v_img img {margin-bottom:20px;max-width:100%;height:auto}
 

skin/member/basic/style.css

@@ -59,7 +59,9 @@
 
 .mbskin .frm_info {}
 
-.mbskin .required {} /* 필수입력 */
+/* 필수입력 */
+.mbskin .required {}
+.mbskin textarea.required {}
 
 /* 테이블 항목별 정의 */
 .mbskin .td_board {}