Commit ffde238f by 藤川諒

BizTaskyell UIUX改善

parent b99412f9
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<span class="collabo-label collaboration_contents document_contents">文書</span> <span class="collabo-label collaboration_contents document_contents">文書</span>
<span class="collabo-label collaboration_contents board_contents">ボード</span> <span class="collabo-label collaboration_contents board_contents">ボード</span>
<span class="mx-3 host_contents">司会者</span> <span class="mx-3 host_contents">司会者</span>
<span class="mx-3 collaboration_contents voice_contents_user video_contents_user picture_contents_user document_contents_user board_contents_user">参加者</span> <span class="mx-3 none">参加者</span>
</div> </div>
</div> </div>
<div class="collabo_nav_r"> <div class="collabo_nav_r">
......
...@@ -246,6 +246,8 @@ input[name="tab_item"] { ...@@ -246,6 +246,8 @@ input[name="tab_item"] {
line-height: 40px; line-height: 40px;
background: #0070ca2b; background: #0070ca2b;
padding-left: 10px; padding-left: 10px;
border-top: 1px solid #0070ca21;
border-bottom: 1px solid #0070ca21;
} }
.category_name { .category_name {
white-space: nowrap; white-space: nowrap;
...@@ -806,10 +808,10 @@ input[name="tab_item"] { ...@@ -806,10 +808,10 @@ input[name="tab_item"] {
} }
.menu_modal .modal-body ul li { .menu_modal .modal-body ul li {
border-bottom: 1px solid #c6c6c6; border-bottom: 1px solid #c6c6c6;
height: 40px; height: 50px;
} }
.menu_modal .modal-body ul li a { .menu_modal .modal-body ul li a {
line-height: 40px; line-height: 50px;
display: block; display: block;
color: #323743; color: #323743;
} }
......
...@@ -53,6 +53,10 @@ ...@@ -53,6 +53,10 @@
margin-bottom: 80px; margin-bottom: 80px;
margin-top: 50px; margin-top: 50px;
} }
#overlay_user_list .user_list {
background: #383838!important;
border: none!important;
}
#collabo_main .user_list_wrap, #collabo_main .user_list_wrap,
#collabo_main .document_wrap, #collabo_main .document_wrap,
#overlay_user_list .user_list_wrap { #overlay_user_list .user_list_wrap {
...@@ -197,8 +201,6 @@ ...@@ -197,8 +201,6 @@
position: absolute; position: absolute;
top: 60px; top: 60px;
right: 0; right: 0;
height: 100vh;
z-index: 999;
} }
#overlay_menu .item01{ #overlay_menu .item01{
opacity: 0; opacity: 0;
...@@ -260,8 +262,12 @@ ...@@ -260,8 +262,12 @@
#overlay_menu .menu_wrap .menu .item { #overlay_menu .menu_wrap .menu .item {
width: 70px; width: 70px;
height: 70px; height: 70px;
background: #20304c42; background: #20304c78;
position: relative; position: relative;
z-index: 999;
}
#overlay_menu .menu_wrap .menu .item.hide{
z-index: 0;
} }
#overlay_menu .menu_wrap .menu .item:hover { #overlay_menu .menu_wrap .menu .item:hover {
background: #20304c4a; background: #20304c4a;
...@@ -286,9 +292,6 @@ ...@@ -286,9 +292,6 @@
width: 40px; width: 40px;
height: 40px; height: 40px;
} }
#overlay_menu .overlay_menu_wrap {
height: calc(100vh - 180px);
}
.fas.fa-wrench{ .fas.fa-wrench{
color: #fff; color: #fff;
font-size: 24px; font-size: 24px;
......
...@@ -32,6 +32,7 @@ main { ...@@ -32,6 +32,7 @@ main {
} }
.nav-item { .nav-item {
padding: 0 10px; padding: 0 10px;
white-space: nowrap;
} }
.nav-ttl { .nav-ttl {
text-align: center; text-align: center;
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</div> </div>
</a> </a>
</div> </div>
<div class="footer_item mx-md-3"> <div class="footer_item mx-md-3 collaboration_contents picture_contents video_contents document_contents board_contents">
<a href="javascript:penToggle();"> <a href="javascript:penToggle();">
<div class="d-flex flex-column justify-content-center" id="penBtn"> <div class="d-flex flex-column justify-content-center" id="penBtn">
<div class="t-icon pen disable my-0"></div> <div class="t-icon pen disable my-0"></div>
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</div> </div>
</a> </a>
</div> </div>
<div class="footer_item mx-md-3"> <div class="footer_item mx-md-3 collaboration_contents picture_contents video_contents document_contents board_contents">
<a href="javascript:eraserToggle();"> <a href="javascript:eraserToggle();">
<div class="d-flex flex-column justify-content-center" id="eraserBtn"> <div class="d-flex flex-column justify-content-center" id="eraserBtn">
<div class="t-icon delete my-0"></div> <div class="t-icon delete my-0"></div>
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
// 閉じるイベント // 閉じるイベント
$(".close_btn").click(function () { $(".close_btn").click(function () {
$("#overlay_add_user_list").addClass("none"); $("#overlay_add_user_list").addClass("none");
no_scroll();
}); });
// ユーザー追加イベント // ユーザー追加イベント
...@@ -52,6 +53,7 @@ ...@@ -52,6 +53,7 @@
// ユーザー招待メンバー検索 // ユーザー招待メンバー検索
$(".add_user_btn").click(function () { $(".add_user_btn").click(function () {
return_scroll();
CHAT_UI.showLoadingIndicator(); CHAT_UI.showLoadingIndicator();
CHAT.globalSelectedUserList = []; CHAT.globalSelectedUserList = [];
CHAT_UI.refreshMyGroupForAddUserInCollaboration(); CHAT_UI.refreshMyGroupForAddUserInCollaboration();
......
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