]> cat aescling's git repositories - mastodon.git/commitdiff
Fix modal items cannot scroll on touch devices (#10605)
authorkedama <kedama@foresdon.jp>
Mon, 22 Apr 2019 12:55:50 +0000 (21:55 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 22 Apr 2019 12:55:50 +0000 (14:55 +0200)
app/javascript/mastodon/features/ui/components/actions_modal.js
app/javascript/styles/mastodon/components.scss

index 9792eba5f70713bd51c8396ac5d3f82549ab9c73..00280f7a685352e27e0c250615755e39826ee615 100644 (file)
@@ -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>
index e697ba554df22a094ae2707a16abccf84dca878d..0b1fd3652380c6fdebd070432da7295530900f19 100644 (file)
@@ -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;