gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Allow clicking behind preview (#11576)

gh/stable
ThibG 2019-08-15 22:47:51 +02:00 committed by Eugen Rochko
parent 1bea318197
commit d37126fd03
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -230,7 +230,7 @@ class FocalPointModal extends ImmutablePureComponent {
<div className='report-modal__statuses'> <div className='report-modal__statuses'>
{focals && ( {focals && (
<div className={classNames('focal-point', { dragging })} ref={this.setRef}> <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='' />}
{media.get('type') === 'gifv' && <video src={media.get('url')} width={width} height={height} loop muted autoPlay />} {media.get('type') === 'gifv' && <video src={media.get('url')} width={width} height={height} loop muted autoPlay />}
@ -240,7 +240,7 @@ class FocalPointModal extends ImmutablePureComponent {
</div> </div>
<div className='focal-point__reticle' style={{ top: `${y * 100}%`, left: `${x * 100}%` }} /> <div className='focal-point__reticle' style={{ top: `${y * 100}%`, left: `${x * 100}%` }} />
<div className='focal-point__overlay' onMouseDown={this.handleMouseDown} onTouchStart={this.handleTouchStart} /> <div className='focal-point__overlay' />
</div> </div>
)} )}

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

@ -5797,7 +5797,12 @@ noscript {
bottom: 10px; bottom: 10px;
right: 10px; right: 10px;
z-index: 2; z-index: 2;
cursor: default; cursor: move;
transition: opacity 0.1s ease;
&:hover {
opacity: 0.5;
}
strong { strong {
color: $primary-text-color; color: $primary-text-color;