diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-03-18 20:21:17 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-03-18 20:21:17 -0500 |
| commit | ab04be2f84132e6b6a83ca86cbabf2cdf13f5894 (patch) | |
| tree | 589ed30bd629a305a28eeb5a458fa0f83945eca3 /app/javascript | |
| parent | 6a6f680d98d114e3bb26e414ad7e3787a62bd129 (diff) | |
| parent | f02411da404f730e3c05dc7dca1ac0f2d631315e (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: config/i18n-tasks.yml
Diffstat (limited to 'app/javascript')
| -rw-r--r-- | app/javascript/mastodon/features/compose/index.js | 2 | ||||
| -rw-r--r-- | app/javascript/styles/mastodon/components.scss | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/index.js b/app/javascript/mastodon/features/compose/index.js index 138bc4e2e..d5cd854db 100644 --- a/app/javascript/mastodon/features/compose/index.js +++ b/app/javascript/mastodon/features/compose/index.js @@ -97,7 +97,7 @@ export default class Compose extends React.PureComponent { <ComposeFormContainer /> {multiColumn && ( <div className='drawer__inner__mastodon'> - <img alt='' src={elephantUIPlane} /> + <img alt='' draggable='false' src={elephantUIPlane} /> </div> )} </div> diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss index ba1c36d07..98c5ccbca 100644 --- a/app/javascript/styles/mastodon/components.scss +++ b/app/javascript/styles/mastodon/components.scss @@ -1842,6 +1842,9 @@ object-position: bottom left; width: 100%; height: 100%; + pointer-events: none; + user-drag: none; + user-select: none; } } |