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

merge 및 충돌 수정

Browse Source
This commit is contained in:
thisgun
2018-06-05 11:39:52 +09:00
parent e281aedf7f 85762d4ed6
commit 5f9c80b48e
19 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
skin/board/gallery/style.css
View File

@ -250,12 +250,12 @@ box-shadow: inset 0 2px 5px rgb(33, 135, 202);}
#bo_v_top {zoom:1}
#bo_v_top:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_top h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#bo_v_top ul ;padding:0;list-style:none;word-break:break-all}
#bo_v_top ul {padding:0;list-style:none;word-break:break-all}
#bo_v_bot {zoom:1}
#bo_v_bot:after {display:block;visibility:hidden;clear:both;content:""}
#bo_v_bot h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#bo_v_bot ul {;padding:0;list-style:none}
#bo_v_bot ul {padding:0;list-style:none}
.bo_v_com {margin:20px 0;float:right}
.bo_v_com li {float:left;margin-left:5px}

2
skin/new/basic/new.skin.php
View File

@ -101,7 +101,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$new_skin_url.'/style.css">', 0);
<?php if ($is_admin) { ?>
<div class="sir_bw02 sir_bw">
<button type="submit" onclick="document.pressed=this.value" class="btn_b01 btn"><i class="fa fa-trash-o" aria-hidden="true"></i><span class="sound_only">선택삭제</span></button>
<button type="submit" onclick="document.pressed=this.title" title="선택삭제" class="btn_b01 btn"><i class="fa fa-trash-o" aria-hidden="true"></i><span class="sound_only">선택삭제</span></button>
</div>
<?php } ?>
</form>

2
skin/social/social_register_member.skin.php
View File

@ -23,7 +23,7 @@ $email_msg = $is_exists_email ? '등록할 이메일이 중복되었습니다.
<form id="fregisterform" name="fregisterform" action="<?php echo $register_action_url; ?>" onsubmit="return fregisterform_submit(this);" method="post" enctype="multipart/form-data" autocomplete="off">
<input type="hidden" name="w" value="<?php echo $w; ?>">
<input type="hidden" name="url" value="<?php echo $urlencode; ?>">
<input type="hidden" name="mb_name" value="<?php echo $user_nick; ?>" >
<input type="hidden" name="mb_name" value="<?php echo $user_name ? $user_name : $user_nick ?>" >
<input type="hidden" name="provider" value="<?php echo $provider_name;?>" >
<input type="hidden" name="action" value="register">