treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix modal items cannot scroll on touch devices (#10605)

lolsob-rspec
kedama 2019-04-22 21:55:50 +09:00 committed by Eugen Rochko
parent 3c6f8de45a
commit 92ced1e94b
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/ui/components/actions_modal.js
View File

@ -64,7 +64,7 @@ export default class ActionsModal extends ImmutablePureComponent {
<div className='modal-root__modal actions-modal'> <div className='modal-root__modal actions-modal'>
{status} {status}
<ul> <ul className={classNames({ 'with-status': !!status })}>
{this.props.actions.map(this.renderAction)} {this.props.actions.map(this.renderAction)}
</ul> </ul>
</div> </div>

5
app/javascript/styles/mastodon/components.scss
View File

@ -4085,6 +4085,11 @@ a.status-card.compact:hover {
ul { ul {
overflow-y: auto; overflow-y: auto;
flex-shrink: 0; flex-shrink: 0;
max-height: 80vh;
&.with-status {
max-height: calc(80vh - 75px);
}
li:empty { li:empty {
margin: 0; margin: 0;