From 4ce6358787614ecd82e16112b0951d4273b41cae Mon Sep 17 00:00:00 2001 From: kedama Date: Mon, 22 Apr 2019 21:55:50 +0900 Subject: [PATCH] [Glitch] Fix modal items cannot scroll on touch devices Port 92ced1e94b6d5fd3e5755d7ceb7ca73e4589bba5 to glitch-soc --- .../flavours/glitch/features/ui/components/actions_modal.js | 2 +- app/javascript/flavours/glitch/styles/components/modal.scss | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/javascript/flavours/glitch/features/ui/components/actions_modal.js b/app/javascript/flavours/glitch/features/ui/components/actions_modal.js index 9ac6dcf49d..724f1c7642 100644 --- a/app/javascript/flavours/glitch/features/ui/components/actions_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/actions_modal.js @@ -114,7 +114,7 @@ export default class ActionsModal extends ImmutablePureComponent {
{status} -
diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss index 05af34680f..2e5b7be551 100644 --- a/app/javascript/flavours/glitch/styles/components/modal.scss +++ b/app/javascript/flavours/glitch/styles/components/modal.scss @@ -621,6 +621,11 @@ ul { overflow-y: auto; flex-shrink: 0; + max-height: 80vh; + + &.with-status { + max-height: calc(80vh - 75px); + } li:empty { margin: 0;