cssファイル修正

public_new/css/chat.css

@@ -96,80 +96,48 @@ input[name="tab_item"] {
   background: aliceblue;
   background: aliceblue;
 }
 }
 /* サムネイル画像 */
 /* サムネイル画像 */
-<<<<<<< HEAD
 .chat_item_l .thumbnail {
 .chat_item_l .thumbnail {
-=======
-.chat_item_l .thubnail {
->>>>>>> origin/develop_createRoom_UI
   width: 50px;
   width: 50px;
   height: 50px;
   height: 50px;
   border-radius: 50%;
   border-radius: 50%;
   overflow: hidden;
   overflow: hidden;
   margin: 0 auto;
   margin: 0 auto;
 }
 }
-<<<<<<< HEAD
 .chat_item_l .thumbnail img{
 .chat_item_l .thumbnail img{
   width: 50px;
   width: 50px;
   height: 50px;
   height: 50px;
 }
 }
 .chat_item_l .thumbnail4 img {
 .chat_item_l .thumbnail4 img {
-=======
-.chat_item_l .thubnail img{
-  width: 50px;
-  height: 50px;
-}
-.chat_item_l .thubnail4 img {
->>>>>>> origin/develop_createRoom_UI
   width: 25px;
   width: 25px;
   height: 25px;
   height: 25px;
   float: left;
   float: left;
 }
 }
 
 
-<<<<<<< HEAD
 .chat_item_l .thumbnail3 .img_wrap:nth-child(1) {
 .chat_item_l .thumbnail3 .img_wrap:nth-child(1) {
-=======
-.chat_item_l .thubnail3 .img_wrap:nth-child(1) {
->>>>>>> origin/develop_createRoom_UI
     width: 25px;
     width: 25px;
     height: 50px;
     height: 50px;
     position: relative;
     position: relative;
     overflow: hidden;
     overflow: hidden;
     float: left;
     float: left;
 }
 }
-<<<<<<< HEAD
 .chat_item_l .thumbnail3 .img_wrap:nth-child(1) img {
 .chat_item_l .thumbnail3 .img_wrap:nth-child(1) img {
-=======
-.chat_item_l .thubnail3 .img_wrap:nth-child(1) img {
->>>>>>> origin/develop_createRoom_UI
     width: 50px;
     width: 50px;
     height: 50px;
     height: 50px;
     position: absolute;
     position: absolute;
     left: -12px;
     left: -12px;
 }
 }
-<<<<<<< HEAD
 .chat_item_l .thumbnail3 .img_wrap:nth-child(2) {
 .chat_item_l .thumbnail3 .img_wrap:nth-child(2) {
-=======
-.chat_item_l .thubnail3 .img_wrap:nth-child(2) {
->>>>>>> origin/develop_createRoom_UI
     width: 25px;
     width: 25px;
     height: 25px;
     height: 25px;
     position: relative;
     position: relative;
     overflow: hidden;
     overflow: hidden;
     float: left;
     float: left;
 }
 }
-<<<<<<< HEAD
 .chat_item_l .thumbnail3 .img_wrap:nth-child(2) img, .chat_item_l .thumbnail3 .img_wrap:nth-child(3) img {
 .chat_item_l .thumbnail3 .img_wrap:nth-child(2) img, .chat_item_l .thumbnail3 .img_wrap:nth-child(3) img {
     width: 25px;
     width: 25px;
     height: 30px;
     height: 30px;
 }
 }
 .chat_item_l .thumbnail3 .img_wrap:nth-child(3) {
 .chat_item_l .thumbnail3 .img_wrap:nth-child(3) {
-=======
-.chat_item_l .thubnail3 .img_wrap:nth-child(2) img, .chat_item_l .thubnail3 .img_wrap:nth-child(3) img {
-    width: 25px;
-    height: 30px;
-}
-.chat_item_l .thubnail3 .img_wrap:nth-child(3) {
->>>>>>> origin/develop_createRoom_UI
     width: 25px;
     width: 25px;
     height: 25px;
     height: 25px;
     position: relative;
     position: relative;
@@ -177,32 +145,20 @@ input[name="tab_item"] {
     float: left;
     float: left;
 }
 }
 
 
-<<<<<<< HEAD
 .chat_item_l .thumbnail2 .img_wrap:nth-child(1) {
 .chat_item_l .thumbnail2 .img_wrap:nth-child(1) {
-=======
-.chat_item_l .thubnail2 .img_wrap:nth-child(1) {
->>>>>>> origin/develop_createRoom_UI
     width: 25px;
     width: 25px;
     height: 50px;
     height: 50px;
     position: relative;
     position: relative;
     overflow: hidden;
     overflow: hidden;
     float: left;
     float: left;
 }
 }
-<<<<<<< HEAD
 .chat_item_l .thumbnail2 .img_wrap:nth-child(2) {
 .chat_item_l .thumbnail2 .img_wrap:nth-child(2) {
-=======
-.chat_item_l .thubnail2 .img_wrap:nth-child(2) {
->>>>>>> origin/develop_createRoom_UI
     width: 25px;
     width: 25px;
     height: 50px;
     height: 50px;
     position: relative;
     position: relative;
     overflow: hidden;
     overflow: hidden;
 }
 }
-<<<<<<< HEAD
 .chat_item_l .thumbnail2 .img_wrap img {
 .chat_item_l .thumbnail2 .img_wrap img {
-=======
-.chat_item_l .thubnail2 .img_wrap img {
->>>>>>> origin/develop_createRoom_UI
     width: 50px;
     width: 50px;
     height: 50px;
     height: 50px;
     position: absolute;
     position: absolute;

public_new/js/chat.js

@@ -341,6 +341,15 @@ $(function() {
         let roomListTitle = getLocalizedString("roomListTitle");
         let roomListTitle = getLocalizedString("roomListTitle");
         $('#chatTitle').text(roomListTitle);
         $('#chatTitle').text(roomListTitle);
     });
     });
+    $('#chatMakeRoom .search_form .cancel').click(function(){
+        CHAT.globalSelectedUserList.forEach(function(userId) {
+            if ($('.checkbox' + userId).prop('checked')) {
+              $('.checkbox' + checkMemberId).attr('checked', true);
+            } else {
+              $('.checkbox' + checkMemberId).removeAttr('checked');
+            }
+        });
+    });
 
 
     // チャットメンバー検索
     // チャットメンバー検索
     $('#chat .search_form input[type="search"]').keyup(function(){
     $('#chat .search_form input[type="search"]').keyup(function(){