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

Improve focal point modal on mobile (#11575) 

* Reduce padding around report modal and focal point modal title

* Increase max allowed height for focal point modal content
lolsob-rspec
ThibG 2019-08-15 22:49:00 +02:00 committed by Eugen Rochko
parent a886bf3808
commit dc83169865
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,7 +228,7 @@ class FocalPointModal extends ImmutablePureComponent {
<Button disabled={!dirty || detecting || length(description) > 420} text={intl.formatMessage(messages.apply)} onClick={this.handleSubmit} /> <Button disabled={!dirty || detecting || length(description) > 420} text={intl.formatMessage(messages.apply)} onClick={this.handleSubmit} />
</div> </div>
<div className='report-modal__statuses'> <div className='focal-point-modal__content'>
{focals && ( {focals && (
<div className={classNames('focal-point', { dragging })} ref={this.setRef} onMouseDown={this.handleMouseDown} onTouchStart={this.handleTouchStart}> <div className={classNames('focal-point', { dragging })} ref={this.setRef} onMouseDown={this.handleMouseDown} onTouchStart={this.handleTouchStart}>
{media.get('type') === 'image' && <img src={media.get('url')} width={width} height={height} alt='' />} {media.get('type') === 'image' && <img src={media.get('url')} width={width} height={height} alt='' />}

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

@ -4534,7 +4534,8 @@ a.status-card.compact:hover {
} }
} }
.report-modal__statuses { .report-modal__statuses,
.focal-point-modal__content {
flex: 1 1 auto; flex: 1 1 auto;
min-height: 20vh; min-height: 20vh;
max-height: 80vh; max-height: 80vh;
@ -4555,6 +4556,12 @@ a.status-card.compact:hover {
} }
} }
.focal-point-modal__content {
@media screen and (max-width: 480px) {
max-height: 40vh;
}
}
.report-modal__comment { .report-modal__comment {
padding: 20px; padding: 20px;
border-right: 1px solid $ui-secondary-color; border-right: 1px solid $ui-secondary-color;
@ -4749,10 +4756,10 @@ a.status-card.compact:hover {
} }
.report-modal__target { .report-modal__target {
padding: 20px; padding: 15px;
.media-modal__close { .media-modal__close {
top: 19px; top: 14px;
right: 15px; right: 15px;
} }
} }