From ea39e13d88078e03de96e4ba8f25e88c5f84d36a Mon Sep 17 00:00:00 2001 From: kanno Date: Mon, 16 Aug 2021 15:11:36 +0900 Subject: [PATCH 1/3] =?UTF-8?q?#62=20=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=81=AE=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E3=81=AE=E7=94=BB=E9=9D=A2=E3=81=AB=E3=81=A6=E3=80=81=E3=83=91?= =?UTF-8?q?=E3=82=B9=E3=83=AF=E3=83=BC=E3=83=89=E3=81=AE=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E7=AD=89=E3=81=AE=E8=A1=A8=E7=A4=BA=E3=81=8C=E5=9F=8B=E3=82=82?= =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=81=84=E3=82=8B=E7=AE=87=E6=89=80=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20CSS=E3=82=92=E4=B8=8A=E6=9B=B8=E3=81=8D?= =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 0b84d86d0aa5d53d1272ee049dc43ed16e4fccb3) --- resources/styles.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/styles.css b/resources/styles.css index 191de4b60..80082e735 100644 --- a/resources/styles.css +++ b/resources/styles.css @@ -22,6 +22,10 @@ transform: scale(0.999); background-clip: padding-box; } + .listViewRecordActions.fix-data-column { + position: static; + transform: none; + } } /* * モーダルウインドウの背景を黒ベースに変更 From 74551c23c7cc3055ec25b1c4e651a0326fd4fe21 Mon Sep 17 00:00:00 2001 From: kanno Date: Mon, 16 Aug 2021 16:11:37 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=81=AE=E3=80=8C=E3=83=A6=E3=83=BC=E3=82=B6?= =?UTF-8?q?=E3=83=BC=E3=80=8D=E3=81=A8=E3=80=8C=E3=83=97=E3=83=AD=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=80=8D=E3=81=AB=E3=81=A6fix-data-?= =?UTF-8?q?column=E3=82=92=E5=89=8A=E9=99=A4=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 4897b4ce311e3e623f5b527f1aff91322b632250) --- layouts/v7/modules/Vtiger/resources/List.js | 12 ++++++++++++ resources/styles.css | 4 ---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/layouts/v7/modules/Vtiger/resources/List.js b/layouts/v7/modules/Vtiger/resources/List.js index c471fb965..04ab76ac1 100644 --- a/layouts/v7/modules/Vtiger/resources/List.js +++ b/layouts/v7/modules/Vtiger/resources/List.js @@ -2809,6 +2809,18 @@ Vtiger.Class("Vtiger_List_Js", { } else { $column.addClass("fix-data-column"); } + + /* + ユーザー管理の「ユーザー」と「プロファイル」にて + fix-data-columnが適応されるとドロップダウンメニューが隠れてしまうので削除する + */ + var module = app.getModuleName(); + var parentModule = app.getParentModuleName(); + if(parentModule == 'Settings'){ + if(module == 'Users' || 'Profiles'){ + $column.removeClass("fix-data-column") + } + } if(i > 0) { $column.css({ diff --git a/resources/styles.css b/resources/styles.css index 80082e735..191de4b60 100644 --- a/resources/styles.css +++ b/resources/styles.css @@ -22,10 +22,6 @@ transform: scale(0.999); background-clip: padding-box; } - .listViewRecordActions.fix-data-column { - position: static; - transform: none; - } } /* * モーダルウインドウの背景を黒ベースに変更 From 4fa0c294f81a0a8e9c8257491110e0069e767463 Mon Sep 17 00:00:00 2001 From: kanno Date: Thu, 30 Sep 2021 10:40:57 +0900 Subject: [PATCH 3/3] =?UTF-8?q?OR=E6=9D=A1=E4=BB=B6=E5=BC=8F=E3=81=8C?= =?UTF-8?q?=E4=B8=8D=E9=81=A9=E5=88=87=E3=81=A7=E3=81=82=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layouts/v7/modules/Vtiger/resources/List.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/v7/modules/Vtiger/resources/List.js b/layouts/v7/modules/Vtiger/resources/List.js index 04ab76ac1..9768a107d 100644 --- a/layouts/v7/modules/Vtiger/resources/List.js +++ b/layouts/v7/modules/Vtiger/resources/List.js @@ -2817,7 +2817,7 @@ Vtiger.Class("Vtiger_List_Js", { var module = app.getModuleName(); var parentModule = app.getParentModuleName(); if(parentModule == 'Settings'){ - if(module == 'Users' || 'Profiles'){ + if(module == 'Users' || module == 'Profiles'){ $column.removeClass("fix-data-column") } }