Merge branch 'origin/develop_apply_design_chat' of…

Merge branch 'origin/develop_apply_design_chat' of gitlab.agentec.jp:abookCommunication/chat_webview into origin/develop_apply_design_chat

# Conflicts:
#	public_new/css/chat.css

public_new/chat_make_room.html

@@ -72,7 +72,7 @@
                 <a href="#" class="w-100" id="rootGroupBtnForMakeRoom">
                 <a href="#" class="w-100" id="rootGroupBtnForMakeRoom">
                   <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="thubnail">
+                      <div class="thumbnail">
                         <img src="icon/icon_prev_top.png" alt="トップグループに戻る" />
                         <img src="icon/icon_prev_top.png" alt="トップグループに戻る" />
                       </div>
                       </div>
                     </div>
                     </div>
@@ -90,7 +90,7 @@
                 <a href="#" class="w-100" id="parentGroupBtnForMakeRoom">
                 <a href="#" class="w-100" id="parentGroupBtnForMakeRoom">
                   <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="thubnail">
+                      <div class="thumbnail">
                         <img src="icon/icon_prev.png" alt="上位グループに戻る" />
                         <img src="icon/icon_prev.png" alt="上位グループに戻る" />
                       </div>
                       </div>
                     </div>
                     </div>

public_new/css/chat.css

@@ -103,6 +103,10 @@ 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;
@@ -113,6 +117,10 @@ 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/template/template_make_room_confirm_user_list.html

@@ -2,7 +2,7 @@
     <li class="d-flex align-items-center">
     <li class="d-flex align-items-center">
         <div class="chat_item d-flex flex-row align-items-center w-100">
         <div class="chat_item d-flex flex-row align-items-center w-100">
             <div class="chat_item_l">
             <div class="chat_item_l">
-                <div class="thubnail">
+                <div class="thumbnail">
                     <div class="img_wrap"><img src="{{profileImage}}" onError="this.src='./img/noImage.png'"/></div>
                     <div class="img_wrap"><img src="{{profileImage}}" onError="this.src='./img/noImage.png'"/></div>
                 </div>
                 </div>
             </div>
             </div>

public_new/template/template_make_room_group_list.html

@@ -2,7 +2,7 @@
     <a href="#" class="w-100" onclick="CHAT_UI.refreshAllGroupForMakeRoom({{id}});">
     <a href="#" class="w-100" onclick="CHAT_UI.refreshAllGroupForMakeRoom({{id}});">
         <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="thubnail">
+                <div class="thumbnail">
                     <img src="icon/icon_folder.png" alt="フォルダ" />
                     <img src="icon/icon_folder.png" alt="フォルダ" />
                 </div>
                 </div>
             </div>
             </div>

public_new/template/template_make_room_group_user_list.html

@@ -12,7 +12,7 @@
                 </div>
                 </div>
             </div>
             </div>
             <div class="chat_item_l">
             <div class="chat_item_l">
-                <div class="thubnail">
+                <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>

public_new/template/template_make_room_user_list.html

@@ -11,7 +11,7 @@
                 </div>
                 </div>
             </div>
             </div>
             <div class="chat_item_l">
             <div class="chat_item_l">
-                <div class="thubnail">
+                <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>