Merge branch 'release_sp3' into 'origin/develop_bugfix'

# Conflicts:
#   public_new/chat.html
#   public_new/contact.html
#   public_new/js/chat-ui.js

public_new/chat.html

@@ -134,7 +134,6 @@
       webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
       webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
       webkit.messageHandlers.getGlobalParameter.postMessage({});
       webkit.messageHandlers.getGlobalParameter.postMessage({});
     }
     }
-
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
       CHAT_SERVER_URL = chatServerUrl;
       CHAT_SERVER_URL = chatServerUrl;
       CMS_SERVER_URL = cmsServerUrl;
       CMS_SERVER_URL = cmsServerUrl;

public_new/chat_room.html

@@ -161,7 +161,7 @@
   <script src="./js/chat-room.js"></script>
   <script src="./js/chat-room.js"></script>
   <script>
   <script>
     function imageModal(image) {
     function imageModal(image) {
-      $('#modal_image').attr('src',image.src);
+      $('#modal_image').attr('src', image.src);
       $('#pictureModalCenter').modal('show');
       $('#pictureModalCenter').modal('show');
     }
     }
 
 

public_new/contact.html

@@ -129,31 +129,7 @@
                 </div>
                 </div>
               </a>
               </a>
             </li>
             </li>
-            <div id="childGroupListArea">
-            <li class="d-flex align-items-center">
-              <a href="chat_room.html" class="w-100">
-                <div class="chat_item d-flex flex-row align-items-center">
-                  <div class="chat_item_l">
-                    <div class="thumbnail">
-                      <img src="icon/icon_folder.png" alt="フォルダ" />
-                    </div>
-                  </div>
-                  <div class="chat_item_m px-0">
-                    <div class="d-flex flex-column">
-                      <div class="chat_item_t">
-                        <span class="chat_item_ttl">子どもグループ</span>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </a>
-              <div class="chat_item_r">
-                <div class="d-flex flex-column">
-                  <span class="star disable"></span>
-                </div>
-              </div>
-            </li>
-            </div>
+            <div id="childGroupListArea"></div>
             <div id="userInGroupList"></div>
             <div id="userInGroupList"></div>
           </ul>
           </ul>
         </div>
         </div>
@@ -234,7 +210,6 @@
       webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
       webkit.messageHandlers.loginInfoRequestMessageHandlerId.postMessage({});
       webkit.messageHandlers.getGlobalParameter.postMessage({});
       webkit.messageHandlers.getGlobalParameter.postMessage({});
     }
     }
-
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
     function getGlobalParam(chatServerUrl, cmsServerUrl, platform, isMobile, isOnline) {
       CHAT_SERVER_URL = chatServerUrl;
       CHAT_SERVER_URL = chatServerUrl;
       CMS_SERVER_URL = cmsServerUrl;
       CMS_SERVER_URL = cmsServerUrl;

public_new/css/chat.css

@@ -90,7 +90,7 @@ input[name="tab_item"] {
   padding-left: 0;
   padding-left: 0;
   text-align: center;
   text-align: center;
   position: absolute;
   position: absolute;
-  right: 20px;
+  right: 0px;
 }
 }
 
 
 /* リスト */
 /* リスト */
@@ -240,14 +240,16 @@ input[name="tab_item"] {
   font: 26px FontAwesome;
   font: 26px FontAwesome;
   font-family: "Font Awesome 5 Free";
   font-family: "Font Awesome 5 Free";
   font-weight: 900;
   font-weight: 900;
-  color: #f5d256;
+  color: #F5D256;
+  padding: 20px;
 }
 }
 .star.disable:before {
 .star.disable:before {
   content: "\f005";
   content: "\f005";
   font: 26px FontAwesome;
   font: 26px FontAwesome;
   font-family: "Font Awesome 5 Free";
   font-family: "Font Awesome 5 Free";
   font-weight: 400;
   font-weight: 400;
-  color: #c4c4c4;
+  color: #C4C4C4;
+  padding: 20px;
 }
 }
 
 
 /* メンバー選択チェックボックス */
 /* メンバー選択チェックボックス */

public_new/js/chat-ui.js

@@ -947,9 +947,6 @@ CHAT_UI.refreshContactScreen = function() {
             android.updateFavorite();
             android.updateFavorite();
         } else {
         } else {
             webkit.messageHandlers.updateGroupInfo.postMessage("0");
             webkit.messageHandlers.updateGroupInfo.postMessage("0");
-            webkit.messageHandlers.updateMyInfo.postMessage({});
-            webkit.messageHandlers.updateGroupUser.postMessage({});
-            webkit.messageHandlers.updateFavorite.postMessage({});
         }
         }
     }
     }