Merge branch 'bugFix/ネームカード名前ずれ' into 'release_sp3'

Bug fix/ネームカード名前ずれ

See merge request !24

public_new/chat_room.html

@@ -138,12 +138,6 @@
   <div id="userProfileModal"></div>
   <div id="chatMenuModal"></div>
   <div id="pictureModal"></div>
-  <!-- メニューモーダル -->
-  <!--#include virtual="modal_chat_menu.html" -->
-  <!-- プロフィールモーダル -->
-  <!--#include virtual="modal_chat_profile.html" -->
-  <!-- 写真メッセージーモーダル -->
-  <!--#include virtual="modal_chat_picture.html" -->
 
   <script src="./js/libs/jquery-3.3.1.min.js"></script>
   <script src="./js/libs/socket.io.js"></script>
@@ -166,7 +160,7 @@
   <script src="./js/chat-websocket.js"></script>
   <script src="./js/chat-room.js"></script>
   <script>
-    function test(image) {
+    function imageModal(image) {
       $('#modal_image').attr('src',image.src);
       $('#pictureModalCenter').modal('show');
     }

public_new/css/chat.css

@@ -742,9 +742,6 @@ input[name="tab_item"] {
 
 /**************************** modal *************************/
 /* メニューモーダル */
-.modal-body {
-    padding-left: 0.6rem;
-}
 .modal-body #modal_image {
     width: 100%;
     height: 100%;
@@ -844,3 +841,12 @@ input[name="tab_item"] {
     max-width: 75%;
   }
 }
+/*************************** ネームカード *************************/
+.prifile_name {
+  padding-top: 20px;
+  padding-bottom: 20px;
+  line-height: 1.2;
+  font-size: 16px;
+  margin-left: auto;
+  margin-right: auto;
+}
\ No newline at end of file

public_new/css/common.css

@@ -152,16 +152,17 @@ main {
 }
 
 .profile_modal #userNameCard-scroll {
-    height: 200px;
-    overflow: auto;
+    height: 150px;
+    overflow: scroll;
     padding-top: 0rem;
-    padding-right: 0rem;
+    padding-right: 1rem;
     margin-top: 1rem;
 }
+.profile_modal .modal-header { display: table; }
 .profile_modal .modal-header,.profile_modal .modal-body { padding-bottom: 0; }
-.profile_modal .modal-footer button { width: 33%; padding: 5px;}
-.profile_modal.w_50 .modal-footer button { width: 50%; padding: 5px;}
-.profile_modal .modal-header .profile_desc{ width: 100%;}
+.profile_modal .modal-footer button { width: 33%; padding: 5px; }
+.profile_modal.w_50 .modal-footer button { width: 50%; padding: 5px; }
+.profile_modal .modal-header .profile_desc { width: 100%; }
 .profile_modal .modal-header .profile_name {
   width: 100%;
   text-align: center;

public_new/js/chat.js

@@ -112,7 +112,7 @@ CHAT.uploadImage = function(formData) {
             let downloadPath = CMS_SERVER_URL + '/chatapi/file/download?fileName=' + imageName + '&roomId=' + CHAT.globalLoginParameter.roomId;
             // アップロードが終了した後ローディング画面から離れてメッセージをメッセージを転送する
             const lightbox = $('<a/>', {'data-lightbox':'attachedImages', 'data-title':imageName});
-            const image = $('<img/>', {src:imgPath, width:'auto', style:'max-width:100%', 'data-toggle':'modal', onclick:'test(this);'});
+            const image = $('<img/>', {src:imgPath, width:'auto', style:'max-width:100%', 'data-toggle':'modal', onclick:'imageModal(this);'});
             const downloadIcon = $('<a/>', {href:downloadPath, class:'fa fa-download', download:res.fileName});
 
             lightbox.append(image);

public_new/template/template_user_name_card.html

@@ -2,13 +2,13 @@
   <div class="modal-dialog modal-dialog-centered" role="document">
     <div class="modal-content">
       <div class="modal-header border-0">
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
         <div class="prifile_desc d-flex flex-row">
           <img src="{{profileUrl}}" onError="this.src='./img/noImage.png'"/>
           <div class="prifile_name"><span>{{name}}</span></div>
         </div>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
       </div>
       <div class="modal-body" id="userNameCard-scroll">
         {{#groupPathList}}