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

[Glitch] Display customized mascot in web UI 

Port relevant parts of 9d4541c612 to glitch-soc
pull/870/head
Thibaut Girka 2018-12-19 20:23:16 +01:00 committed by ThibG
parent fb63941c47
commit 6073195a7d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/flavours/glitch/features/drawer/index.js
View File

@ -23,7 +23,7 @@ import DrawerResults from './results';
import DrawerSearch from './search'; import DrawerSearch from './search';
// Utils. // Utils.
import { me } from 'flavours/glitch/util/initial_state'; import { me, mascot } from 'flavours/glitch/util/initial_state';
import { wrap } from 'flavours/glitch/util/redux_helpers'; import { wrap } from 'flavours/glitch/util/redux_helpers';
// Messages. // Messages.
@ -127,7 +127,7 @@ class Drawer extends React.Component {
<Composer /> <Composer />
{multiColumn && ( {multiColumn && (
<div className='drawer__inner__mastodon'> <div className='drawer__inner__mastodon'>
<button className='mastodon' onClick={onClickElefriend} /> {mascot ? <img alt='' draggable='false' src={mascot} /> : <button className='mastodon' onClick={onClickElefriend} />}
</div> </div>
)} )}
</div>} </div>}

1
app/javascript/flavours/glitch/util/initial_state.js
View File

@ -24,6 +24,7 @@ export const searchEnabled = getMeta('search_enabled');
export const maxChars = (initialState && initialState.max_toot_chars) || 500; export const maxChars = (initialState && initialState.max_toot_chars) || 500;
export const invitesEnabled = getMeta('invites_enabled'); export const invitesEnabled = getMeta('invites_enabled');
export const version = getMeta('version'); export const version = getMeta('version');
export const mascot = getMeta('mascot');
export const isStaff = getMeta('is_staff'); export const isStaff = getMeta('is_staff');
export default initialState; export default initialState;