mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Glitch] Allow clicking behind preview 

Port d37126fd03 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
pull/1199/head
ThibG 2019-08-15 22:47:51 +02:00 committed by Thibaut Girka
parent 91d968bf72
commit fcd2244015
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/flavours/glitch/features/ui/components/focal_point_modal.js
View File

@ -230,7 +230,7 @@ class FocalPointModal extends ImmutablePureComponent {
<div className='report-modal__statuses'>
{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') === 'gifv' && <video src={media.get('url')} width={width} height={height} loop muted autoPlay />}
@ -240,7 +240,7 @@ class FocalPointModal extends ImmutablePureComponent {
</div>
<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>
)}

7
app/javascript/flavours/glitch/styles/components/modal.scss
View File

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