Skip to content

Commit

Permalink
Fix modal items cannot scroll on touch devices (mastodon#10605)
Browse files Browse the repository at this point in the history
  • Loading branch information
kedamaDQ authored and hiyuki2578 committed Oct 2, 2019
1 parent fe918e7 commit 7842aa9
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions app/javascript/styles/mastodon/components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 7842aa9

Please sign in to comment.