Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Display customized mascot in web UI and fix admin form for it (#8964)

Browse source 
Follow-up to #8766
This commit is contained in:
Eugen Rochko 2018-10-12 04:04:08 +02:00 • committed by GitHub
parent 22de24b8ca
commit 9d4541c612
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/features/compose/index.js
View file

@ -13,6 +13,7 @@ import spring from 'react-motion/lib/spring';
import SearchResultsContainer from './containers/search_results_container';
import { changeComposing } from '../../actions/compose';
import elephantUIPlane from '../../../images/elephant_ui_plane.svg';
import { mascot } from '../../initial_state';
const messages = defineMessages({
start: { id: 'getting_started.heading', defaultMessage: 'Getting started' },
@ -107,7 +108,7 @@ class Compose extends React.PureComponent {
<ComposeFormContainer />
{multiColumn && (
<div className='drawer__inner__mastodon'>
<img alt='' draggable='false' src={elephantUIPlane} />
<img alt='' draggable='false' src={mascot || elephantUIPlane} />
</div>
)}
</div>}

1
app/javascript/mastodon/initial_state.js
View file

@ -14,5 +14,6 @@ export const me = getMeta('me');
export const searchEnabled = getMeta('search_enabled');
export const invitesEnabled = getMeta('invites_enabled');
export const version = getMeta('version');
export const mascot = getMeta('mascot');
export default initialState;