Merge commit '45f74721' into…

Merge commit '45f74721' into bugFix/#433group_screen_corporate_topButton_

public_new/chat.html

@@ -31,7 +31,7 @@
         </div>
         </div>
       </div>
       </div>
       <div class="col-4 pl-0">
       <div class="col-4 pl-0">
-        <div class="nav-item text-right">
+        <div class="nav-item text-right craeteRoomButton">
           <a href="chat_make_room.html">
           <a href="chat_make_room.html">
             <img src="icon/icon_make_room.png" alt="ルーム開設">
             <img src="icon/icon_make_room.png" alt="ルーム開設">
           </a>
           </a>

public_new/css/collaboration.css

@@ -274,6 +274,7 @@
   font-weight: bold;
   font-weight: bold;
   font-size: 20px;
   font-size: 20px;
 }
 }
+
 #captyaModal .modal-body,
 #captyaModal .modal-body,
 #changeHostModal .modal-body,
 #changeHostModal .modal-body,
 #hostRequestModal .modal-body {
 #hostRequestModal .modal-body {

public_new/css/common.css

@@ -119,6 +119,13 @@ main{ margin-top: 60px; }
   height: 60px;
   height: 60px;
   border-radius: 50%;
   border-radius: 50%;
 }
 }
+.profile_modal #userNameCard-scroll {
+    height: 200px;
+    overflow: auto;
+    padding-top: 0rem;
+    padding-right: 0rem;
+    margin-top: 1rem;
+}
 .profile_modal .modal-header,.profile_modal .modal-body { padding-bottom: 0; }
 .profile_modal .modal-header,.profile_modal .modal-body { padding-bottom: 0; }
 .profile_modal .modal-footer button { width: 33%; padding: 5px;}
 .profile_modal .modal-footer button { width: 33%; padding: 5px;}
 .profile_modal.w_50 .modal-footer button { width: 50%; padding: 5px;}
 .profile_modal.w_50 .modal-footer button { width: 50%; padding: 5px;}

public_new/js/common.js

@@ -39,6 +39,7 @@ $(function() {
     $('.cancel').removeClass('none');
     $('.cancel').removeClass('none');
     $('.search_form form').addClass('d-flex flex-row h-100 align-items-center');
     $('.search_form form').addClass('d-flex flex-row h-100 align-items-center');
     $('.content').addClass('none');
     $('.content').addClass('none');
+    $('.craeteRoomButton').addClass('none');
   });
   });
   // 共通検索フォーム　キャンセルボタン押下イベント
   // 共通検索フォーム　キャンセルボタン押下イベント
   $('.search_form .cancel').click(function(){
   $('.search_form .cancel').click(function(){
@@ -48,6 +49,7 @@ $(function() {
     $('.search_form form').removeClass();
     $('.search_form form').removeClass();
     $('.content').removeClass('none');
     $('.content').removeClass('none');
     $('.overlay_src_msg').empty();
     $('.overlay_src_msg').empty();
+    $('.craeteRoomButton').removeClass('none');
   });
   });
 
 
   $('.message_input_form').click(function(){
   $('.message_input_form').click(function(){

public_new/template/template_user_name_card.html

@@ -10,7 +10,7 @@
           <span aria-hidden="true">&times;</span>
           <span aria-hidden="true">&times;</span>
         </button>
         </button>
       </div>
       </div>
-      <div class="modal-body">
+      <div class="modal-body" id="userNameCard-scroll">
         {{#groupPathList}}
         {{#groupPathList}}
         <li onclick="CHAT_UI.refreshAllGroupSearch({{groupId}});"><b>{{groupPath}}</b></li>
         <li onclick="CHAT_UI.refreshAllGroupSearch({{groupId}});"><b>{{groupPath}}</b></li>
         {{/groupPathList}}
         {{/groupPathList}}