firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

머지 충돌 수정

Browse Source
This commit is contained in:
chicpro
2013-05-03 16:54:54 +09:00
parent ba1e481f2a 66fc37bc5f
commit 50d4077eb6
16 changed files with 220 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/skin/board/basic/style.css
View File

@ -11,17 +11,9 @@
#bo_cate a:active {text-decoration:none}
#bo_cate #bo_cate_on {z-index:2;border:1px solid #565e60;background:#fff;color:#565e60;font-weight:bold}
.bo_list table {margin-bottom:1.5em;width:100%;border-collapse:collapse;border-spacing:0}
.bo_list th {}
.bo_list th a {color:#fff;text-decoration:none}
.bo_list td {border-bottom:1px solid #ddd}
.bo_list img {margin-right:4px}
.bo_list img:nth-last-of-type(1) {margin-right:0}
/* 관리자일 때 */
#bo_list_admin th label {position:absolute;font-size:0;line-height:0;overflow:hidden}
#bo_list_admin th:nth-of-type(1) {width:40px}
#bo_list_admin th:nth-of-type(3) {width:100px}

8
mobile/skin/board/basic/view.skin.php
View File

@ -115,7 +115,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
?>
</nav>
<article id="bo_v_atc">
<article id="bo_v_atc" class="img_resize">
<header>
<h1>본문</h1>
</header>
@ -182,8 +182,6 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
</div>
<script>
<?php if ($board['bo_download_point'] < 0) { ?>
$(function() {
@ -237,8 +235,8 @@ $(function() {
function view_image_resize()
{
var $img = $("#bo_v_atc img");
var img_wrap = $("#bo_v_atc").width();
var $img = $(".img_resize img");
var img_wrap = $(".img_resize").width();
$img.each(function() {
var img_width = $(this).width();