summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-03-18 20:32:44 +0100
committerGitHub <noreply@github.com>2018-03-18 20:32:44 +0100
commit3b440bd5af92682c388140035c1bcdc6f9711b1d (patch)
tree295dec38eb109f46228930bf2d75ad1c945b867f /app
parent39f27b6cf3868806fc3a35003f8600f60795d737 (diff)
Fix elephant graphic being draggable and selectable (#6819)
Diffstat (limited to 'app')
-rw-r--r--app/javascript/mastodon/features/compose/index.js2
-rw-r--r--app/javascript/styles/mastodon/components.scss3
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 138bc4e2ec7..d5cd854db17 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 587fe62da81..20e07a042e2 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;
}
}