]> cat aescling's git repositories - mastodon.git/commitdiff
[Glitch] Fix modal items cannot scroll on touch devices
authorkedama <kedama@foresdon.jp>
Mon, 22 Apr 2019 12:55:50 +0000 (21:55 +0900)
committerThibaut Girka <thib@sitedethib.com>
Mon, 22 Apr 2019 20:57:39 +0000 (22:57 +0200)
Port d763d39d2628bef123cdc801b2a3a3922b7e37f2 to glitch-soc

app/javascript/flavours/glitch/features/ui/components/actions_modal.js
app/javascript/flavours/glitch/styles/components/modal.scss

index 9ac6dcf49d4b9563096344236d473089a9ddc597..724f1c76422ea017b05ade11bbf6d5c015b11ecc 100644 (file)
@@ -114,7 +114,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 05af34680f98248f8b303616026500cdba2ef328..2e5b7be55125354cfc11b118c992f8a9404e4373 100644 (file)
   ul {
     overflow-y: auto;
     flex-shrink: 0;
+    max-height: 80vh;
+
+    &.with-status {
+      max-height: calc(80vh - 75px);
+    }
 
     li:empty {
       margin: 0;