Skip to content

C
chat_webview
Commit e9717514 by Lee Munkyeong
Options

Merge branch 'features/change_collaboration_ui_to_fermi' into 'release_sp3' 

Features/change collaboration ui to fermi

See merge request !104
parents d0dd14b2 bba8864f
Showing with 19 additions and 132 deletions
public_new/collaboration_picture.html
...@@ -27,15 +27,12 @@ ...@@ -27,15 +27,12 @@
<div class="collabo_nav_r"> <div class="collabo_nav_r">
<div class="text-right d-flex align-items-center"> <div class="text-right d-flex align-items-center">
<button type="button" name="button" class="btn user_btn"></button> <button type="button" name="button" class="btn user_btn"></button>
<!--<button type="button" name="button" class="btn add_user_btn none"></button>--> <button type="button" name="button" class="btn exit_btn" onclick="Coview_exitCollaboration();"></button>
<!--<button type="button" name="button" class="btn menu_btn none"></button>-->
</div> </div>
</div> </div>
</div> </div>
</header><!-- header --> </header><!-- header -->
<!-- 拡大縮小機能 -->
<div id="zoom"></div>
<!-- コンテンツ --> <!-- コンテンツ -->
<main id="collabo_main" class="none"> <main id="collabo_main" class="none">
<div class="document_wrap"> <div class="document_wrap">
...@@ -62,63 +59,10 @@ ...@@ -62,63 +59,10 @@
<div id="collaboration_overlay_user_list"></div> <div id="collaboration_overlay_user_list"></div>
</div> </div>
<!-- キャプチャ　モーダル -->
<div id="modal_collabo_capture"></div>
<!-- プロフィールモーダル --> <!-- プロフィールモーダル -->
<div id="userProfileModalInCollaboration"></div> <div id="userProfileModalInCollaboration"></div>
<div id="modal_collabo_profile2"></div> <div id="modal_collabo_profile2"></div>
<!-- ホスト変更モーダル -->
<div id="modal_collabo_change_host"></div>
<!-- ホストリクエストモーダル -->
<div id="modal_collabo_host_request"></div>
<!-- フッター -->
<footer id="collabo_footer_menu" class="active">
<button type="button" name="button" class="footer_menu_btn"></button>
<div class="footer_menu-wrap d-flex justify-content-around h-100">
<div class="d-flex align-items-center h-100">
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_red" id="penBtn">
<img src="icon/icon_collabo_pen_white.png" alt="ペン">
</div>
</a>
</div>
<div class="footer_menu_item none">
<a href="#">
<div class="img_wrap bg_blue">
<img src="icon/icon_collabo_place_white.png" alt="場所">
</div>
</a>
</div>
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_blue" id="eraserBtn">
<img src="icon/icon_collabo_delete_white.png" alt="削除">
</div>
</a>
</div>
</div>
<div class="d-flex align-items-center h-100 none">
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_gray">
<img src="icon/icon_collabo_rewind_white.png" alt="戻る">
</div>
</a>
</div>
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_gray">
<img src="icon/icon_collabo_forward_white.png" alt="進む">
</div>
</a>
</div>
</div>
</div>
</footer>
<!-- フッター -->
<div id="footer_collabo"></div>
<div id="loadingArea"></div>
<script src="./js/libs/jquery-3.3.1.min.js"></script> <script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/socket.io.js"></script> <script src="./js/libs/socket.io.js"></script>
<script src="./js/libs/moment.js"></script> <script src="./js/libs/moment.js"></script>
...@@ -143,14 +87,8 @@ ...@@ -143,14 +87,8 @@
<script src="https://livetaskyell.abookcloud.com/coview_api.js"></script> <script src="https://livetaskyell.abookcloud.com/coview_api.js"></script>
<script src="./js/share.js"></script> <script src="./js/share.js"></script>
<script> <script>
$("#footer_collabo").load("./footer_collabo.html");
$("#modal_collabo_host_request").load("./modal_collabo_host_request.html");
$("#modal_collabo_change_host").load("./modal_collabo_change_host.html");
$("#modal_collabo_capture").load("./modal_collabo_capture.html");
$("#modal_collabo_profile2").load("./modal_collabo_profile2.html"); $("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
$("#loadingArea").load("./loading.html");
$("#collaboration_picture_overlay_menu").load("./collaboration_picture_overlay_menu.html"); $("#collaboration_picture_overlay_menu").load("./collaboration_picture_overlay_menu.html");
$("#zoom").load("./zoom.html");
let CHAT_SERVER_URL = ''; let CHAT_SERVER_URL = '';
let CMS_SERVER_URL = ''; let CMS_SERVER_URL = '';
......
public_new/collaboration_video.html
...@@ -26,16 +26,12 @@ ...@@ -26,16 +26,12 @@
<div class="collabo_nav_r"> <div class="collabo_nav_r">
<div class="text-right d-flex align-items-center"> <div class="text-right d-flex align-items-center">
<button type="button" name="button" class="btn user_btn"></button> <button type="button" name="button" class="btn user_btn"></button>
<!--<button type="button" name="button" class="btn add_user_btn none"></button>--> <button type="button" name="button" class="btn exit_btn" onclick="Coview_exitCollaboration();"></button>
<!--<button type="button" name="button" class="btn menu_btn none"></button>-->
</div> </div>
</div> </div>
</div> </div>
</header><!-- header --> </header><!-- header -->
<!-- 拡大縮小機能 -->
<div id="zoom"></div>
<!-- コンテンツ --> <!-- コンテンツ -->
<main id="collabo_main" class="none"> <main id="collabo_main" class="none">
<div class="document_wrap"> <div class="document_wrap">
...@@ -52,18 +48,12 @@ ...@@ -52,18 +48,12 @@
</button> </button>
</div> </div>
<!-- ユーザー追加オーバーレイ -->
<div id="add_user_list"></div>
<!-- オーバーレイ　メニュー --> <!-- オーバーレイ　メニュー -->
<div id="collaboration_video_overlay_menu"></div> <div id="collaboration_video_overlay_menu"></div>
<!-- オーバーレイ　ユーザーリスト --> <!-- オーバーレイ　ユーザーリスト -->
<div id="overlay_user_list" class="overlay noscroll"> <div id="overlay_user_list" class="overlay noscroll">
<div id="collaboration_overlay_user_list"></div> <div id="collaboration_overlay_user_list"></div>
</div> </div>
<!-- キャプチャ　モーダル -->
<div id="modal_collabo_capture"></div>
<!-- プロフィールモーダル --> <!-- プロフィールモーダル -->
<div id="userProfileModalInCollaboration"></div> <div id="userProfileModalInCollaboration"></div>
<div id="modal_collabo_profile2"></div> <div id="modal_collabo_profile2"></div>
...@@ -71,47 +61,6 @@ ...@@ -71,47 +61,6 @@
<div id="modal_collabo_change_host"></div> <div id="modal_collabo_change_host"></div>
<!-- ホストリクエストモーダル --> <!-- ホストリクエストモーダル -->
<div id="modal_collabo_host_request"></div> <div id="modal_collabo_host_request"></div>
<!-- フッター -->
<footer id="collabo_footer_menu" class="active">
<button type="button" name="button" class="footer_menu_btn"></button>
<div class="footer_menu-wrap d-flex justify-content-around h-100">
<div class="d-flex align-items-center h-100">
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_red" id="penBtn">
<img src="icon/icon_collabo_pen_white.png" alt="ペン">
</div>
</a>
</div>
<div class="footer_menu_item none">
<a href="#">
<div class="img_wrap bg_blue">
<img src="icon/icon_collabo_place_white.png" alt="場所">
</div>
</a>
</div>
<div class="footer_menu_item">
<a href="#">
<div class="img_wrap bg_blue" id="eraserBtn">
<img src="icon/icon_collabo_delete_white.png" alt="削除">
</div>
</a>
</div>
</div>
<div class="d-flex align-items-center h-100">
<div class="footer_menu_item none">
<!-- <a href="#" data-toggle="modal" data-target="#captyaModal">-->
<a href="#">
<div class="img_wrap wide bg_blue" id="captureBtn">
<img src="icon/icon_collabo_capture.png" alt="キャプチャ">
<span>キャプチャ</span>
</div>
</a>
</div>
</div>
</div>
</footer>
<!-- フッター --> <!-- フッター -->
<div id="footer_collabo"></div> <div id="footer_collabo"></div>
<div id="loadingArea"></div> <div id="loadingArea"></div>
...@@ -140,14 +89,9 @@ ...@@ -140,14 +89,9 @@
<script src="./js/share.js"></script> <script src="./js/share.js"></script>
</body> </body>
<script> <script>
$("#footer_collabo").load("./footer_collabo.html");
$("#modal_collabo_host_request").load("./modal_collabo_host_request.html");
$("#modal_collabo_change_host").load("./modal_collabo_change_host.html");
$("#modal_collabo_capture").load("./modal_collabo_capture.html");
$("#modal_collabo_profile2").load("./modal_collabo_profile2.html"); $("#modal_collabo_profile2").load("./modal_collabo_profile2.html");
$("#loadingArea").load("./loading.html");
$("#collaboration_video_overlay_menu").load("./collaboration_video_overlay_menu.html"); $("#collaboration_video_overlay_menu").load("./collaboration_video_overlay_menu.html");
$("#zoom").load("./zoom.html");
let CHAT_SERVER_URL = ''; let CHAT_SERVER_URL = '';
let CMS_SERVER_URL = ''; let CMS_SERVER_URL = '';
......
public_new/css/chat.css
...@@ -608,7 +608,6 @@ input[name="tab_item"] { ...@@ -608,7 +608,6 @@ input[name="tab_item"] {
/* 自分の会話 */ /* 自分の会話 */
.room_right { .room_right {
margin-left: 40%;
position: relative; position: relative;
margin-bottom: 20px; margin-bottom: 20px;
max-width: 75%; max-width: 75%;
...@@ -796,6 +795,12 @@ input[name="tab_item"] { ...@@ -796,6 +795,12 @@ input[name="tab_item"] {
background: aliceblue; background: aliceblue;
} }
.my_messages {
display: flow-root;
width: 100%;
height: fit-content;
}
@media screen and (max-width: 768px) { @media screen and (max-width: 768px) {
/* chat item */ /* chat item */
.tab_item { .tab_item {
......
public_new/css/collaboration.css
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
/**************************** main *************************/ /**************************** main *************************/
#collabo_main { #collabo_main {
height: calc(100vh - 180px); height: calc(100vh - 50px);
position: relative; position: relative;
margin-bottom: 120px; margin-bottom: 120px;
} }
...@@ -122,11 +122,14 @@ ...@@ -122,11 +122,14 @@
.btn.add_user_btn { .btn.add_user_btn {
background-image: url("../icon/icon_add_member_white.png"); background-image: url("../icon/icon_add_member_white.png");
} }
.btn.exit_btn {
background-image: url("../icon/icon_close.png");
}
.btn.menu_btn.hide, .btn.menu_btn.hide,
.btn.add_user_btn.hide, .btn.add_user_btn.hide,
.btn.user_btn.hide { .btn.user_btn.hide {
transition: 0.3s; transition: 0.3s;
background-image: url("../icon/icon_close.png"); background-image: url("../icon/icon_member_blue.png");
} }
.overlay { .overlay {
transition: 0.7s; transition: 0.7s;
......
public_new/css/share.css
...@@ -144,13 +144,7 @@ ...@@ -144,13 +144,7 @@
border-radius: 5px; border-radius: 5px;
} }
.coview_on_screen_btn_area {
display: none; !important;
}
.coview_on_media_btn_back { .coview_on_media_btn_back {
top: 70px !important; top: 70px !important;
} }
#localVideo {
top: 0px !important;
}
public_new/template/template_my_message.html
<div class="my_messages">
<div class="room_right"> <div class="room_right">
<div class="text">{{text}}</div> <div class="text">{{text}}</div>
{{#isToday}} {{#isToday}}
...@@ -15,3 +16,4 @@ ...@@ -15,3 +16,4 @@
<div class="unread d-flex align-items-end"><span>{{unreadCount}}</span></div> <div class="unread d-flex align-items-end"><span>{{unreadCount}}</span></div>
{{/unreadCount}} {{/unreadCount}}
</div> </div>
</div>
\ No newline at end of file
public_new/template/template_user_name_card.html
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</div> </div>
</button> </button>
{{/isFavorite}} {{/isFavorite}}
<button type="button" class="border-0 bg_dark_gray"> <button type="button" class="border-0 bg_gray">
<div class="d-flex flex-column"> <div class="d-flex flex-column">
<div class="img_wrap"> <div class="img_wrap">
<img src="icon/icon_profile_phone.png" alt="通話" onclick="alert(getLocalizedString('notify_not_released'));"> <img src="icon/icon_profile_phone.png" alt="通話" onclick="alert(getLocalizedString('notify_not_released'));">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment