Merge branch 'feature/42966_modify_collaboration_screen_ui' into 'develop'

ボタンの位置と通話中メッセージ追加。

See merge request !148

public_new/collaboration.html

@@ -23,13 +23,14 @@
   <header id="collabo_header">
     <div class="d-flex align-items-center h-100">
       <div class="collabo_nav_l text-left w-100">
+        通話中
       </div>
       <div class="collabo_nav_r">
         <div class="text-right d-flex align-items-center">
           <button type="button" name="button" class="btn user_btn collaboration_contents picture_contents video_contents board_contents"></button>
-          <button type="button" name="button" class="btn menu_btn host_contents"></button>
           <button type="button" name="button" class="btn add_user_btn none"></button>
           <button type="button" name="button" class="btn start_pip_btn collaboration_contents document_contents" onclick="startPipMode();"></button>
+          <button type="button" name="button" class="btn menu_btn host_contents"></button>
           <!-- <button type="button" name="button" class="btn exit_btn" onclick="Coview_exitCollaboration();"></button> -->
         </div>
       </div>