Skip to content

C
chat_webview
Commit 2e455b85 by Kang Donghun
Options

マジリクエストで見つけた問題修正

parent c49dc801
Showing with 14 additions and 31 deletions
public_new/collaboration_overlay_add_user_list.html
...@@ -61,7 +61,8 @@ ...@@ -61,7 +61,8 @@
</div> </div>
</div> </div>
<div class="user_item_l"> <div class="user_item_l">
<div class="thumbnail"><div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div> <div class="thumbnail">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
</div> </div>
</div> </div>
<div class="user_item_m"> <div class="user_item_m">
...@@ -84,7 +85,8 @@ ...@@ -84,7 +85,8 @@
</div> </div>
</div> </div>
<div class="user_item_l"> <div class="user_item_l">
<div class="thumbnail"><div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div> <div class="thumbnail">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
</div> </div>
</div> </div>
<div class="user_item_m"> <div class="user_item_m">
...@@ -107,7 +109,8 @@ ...@@ -107,7 +109,8 @@
</div> </div>
</div> </div>
<div class="user_item_l"> <div class="user_item_l">
<div class="thumbnail"><div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div> <div class="thumbnail">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
</div> </div>
</div> </div>
<div class="user_item_m"> <div class="user_item_m">
...@@ -130,7 +133,8 @@ ...@@ -130,7 +133,8 @@
</div> </div>
</div> </div>
<div class="user_item_l"> <div class="user_item_l">
<div class="thumbnail"><div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div> <div class="thumbnail">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
</div> </div>
</div> </div>
<div class="user_item_m"> <div class="user_item_m">
...@@ -153,7 +157,8 @@ ...@@ -153,7 +157,8 @@
</div> </div>
</div> </div>
<div class="user_item_l"> <div class="user_item_l">
<div class="thumbnail"><div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div> <div class="thumbnail">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
</div> </div>
</div> </div>
<div class="user_item_m"> <div class="user_item_m">
...@@ -176,7 +181,8 @@ ...@@ -176,7 +181,8 @@
</div> </div>
</div> </div>
<div class="user_item_l"> <div class="user_item_l">
<div class="thumbnail"><div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div> <div class="thumbnail">
<div class="img_wrap"><img src="img/thumbnail.png" alt="サムネイル画像" /></div>
</div> </div>
</div> </div>
<div class="user_item_m"> <div class="user_item_m">
......
public_new/css/chat.css
...@@ -103,10 +103,6 @@ input[name="tab_item"] { ...@@ -103,10 +103,6 @@ input[name="tab_item"] {
overflow: hidden; overflow: hidden;
margin: 0 auto; margin: 0 auto;
} }
<<<<<<< HEAD
=======
>>>>>>> 20fd104461a13632e6bf4112a272fa5d3e82c248
.chat_item_l .thumbnail img{ .chat_item_l .thumbnail img{
width: 50px; width: 50px;
height: 50px; height: 50px;
...@@ -117,10 +113,6 @@ input[name="tab_item"] { ...@@ -117,10 +113,6 @@ input[name="tab_item"] {
float: left; float: left;
} }
<<<<<<< HEAD
=======
>>>>>>> 20fd104461a13632e6bf4112a272fa5d3e82c248
.chat_item_l .thumbnail3 .img_wrap:nth-child(1) { .chat_item_l .thumbnail3 .img_wrap:nth-child(1) {
width: 25px; width: 25px;
height: 50px; height: 50px;
......
public_new/js/chat.js
...@@ -269,21 +269,6 @@ CHAT.leaveRoom = function() { ...@@ -269,21 +269,6 @@ CHAT.leaveRoom = function() {
} }
$(function() { $(function() {
// ルーム開設メンバー数カウント
$('input:checkbox').change(function() {
if($(this).prop('checked')){
$(this).attr('checked', true);
}else{
$(this).removeAttr('checked');
}
}).trigger('change');
// チェックした人数カウント
$('input:checkbox').change(function() {
var cnt = $('.checkbox input:checkbox:checked').length;
$('.select_member_num').text(cnt);
}).trigger('change');
// ルーム人数選択確認イベント // ルーム人数選択確認イベント
$('.make_room_btn button').click(function(){ $('.make_room_btn button').click(function(){
$('form').submit(); $('form').submit();
......
public_new/template/template_user_list.html
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
<a href="javascript:return false;" onclick="CHAT_UI.makeNameCard({{shopMemberId}})" style="width: 100%;"> <a href="javascript:return false;" onclick="CHAT_UI.makeNameCard({{shopMemberId}})" style="width: 100%;">
<div class="chat_item d-flex flex-row align-items-center"> <div class="chat_item d-flex flex-row align-items-center">
<div class="chat_item_l"> <div class="chat_item_l">
<div class="thumbnail"> <div class="thumbnail">
<div class="img_wrap"><img src="{{profileUrl}}" onError="this.src='./img/noImage.png'" /></div> <div class="img_wrap"><img src="{{profileUrl}}" onError="this.src='./img/noImage.png'" /></div>
</div> </div>
</div> </div>
<div class="chat_item_m px-0"> <div class="chat_item_m px-0">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment