about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkedama <kedama@foresdon.jp>2019-04-22 21:55:50 +0900
committerEugen Rochko <eugen@zeonfederated.com>2019-04-22 14:55:50 +0200
commitd763d39d2628bef123cdc801b2a3a3922b7e37f2 (patch)
tree95c8f9c539866c8624783e99dff447a4dca587a4
parentbdec58b514a18779c931d20f947e7ca80b29e8b4 (diff)
Fix modal items cannot scroll on touch devices (#10605)
-rw-r--r--app/javascript/mastodon/features/ui/components/actions_modal.js2
-rw-r--r--app/javascript/styles/mastodon/components.scss5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/ui/components/actions_modal.js b/app/javascript/mastodon/features/ui/components/actions_modal.js
index 9792eba5f..00280f7a6 100644
--- a/app/javascript/mastodon/features/ui/components/actions_modal.js
+++ b/app/javascript/mastodon/features/ui/components/actions_modal.js
@@ -64,7 +64,7 @@ export default class ActionsModal extends ImmutablePureComponent {
       <div className='modal-root__modal actions-modal'>
         {status}
 
-        <ul>
+        <ul className={classNames({ 'with-status': !!status })}>
           {this.props.actions.map(this.renderAction)}
         </ul>
       </div>
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index e697ba554..0b1fd3652 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -4085,6 +4085,11 @@ a.status-card.compact:hover {
   ul {
     overflow-y: auto;
     flex-shrink: 0;
+    max-height: 80vh;
+
+    &.with-status {
+      max-height: calc(80vh - 75px);
+    }
 
     li:empty {
       margin: 0;