mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-30 01:39:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change emoji picker icon to :blobCat:.

Browse source
This commit is contained in:
Jeremy Kescher 2022-05-02 01:12:39 +02:00
parent cef17863c9
commit 8d34a2c2f5
No known key found for this signature in database
GPG key ID: 48DFE4BB15BA5940
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/javascript/flavours/glitch/features/emoji_picker/index.js
View file

@ -471,9 +471,10 @@ class EmojiPickerDropdown extends React.PureComponent {
<div ref={this.setTargetRef} className='emoji-button' title={title} aria-label={title} aria-expanded={active} role='button' onClick={this.onToggle} onKeyDown={this.onToggle} tabIndex={0}> <div ref={this.setTargetRef} className='emoji-button' title={title} aria-label={title} aria-expanded={active} role='button' onClick={this.onToggle} onKeyDown={this.onToggle} tabIndex={0}>
{button || <img {button || <img
className={classNames('emojione', { 'pulse-loading': active && loading })} className={classNames('emojione', { 'pulse-loading': active && loading })}
alt='🙂' alt='blobCat emoji'
src={`${assetHost}/emoji/1f602.svg`} src='https://catcatnya.com/custom_emojis/images/000/002/356/static/blobCat.png'
/>} />}
{/* TODO: Fetch :blobCat: From custom_emojis directly */}
</div> </div>
<Overlay show={active} placement={placement} target={this.findTarget}> <Overlay show={active} placement={placement} target={this.findTarget}>

5
app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js
View file

@ -389,9 +389,10 @@ class EmojiPickerDropdown extends React.PureComponent {
<div ref={this.setTargetRef} className='emoji-button' title={title} aria-label={title} aria-expanded={active} role='button' onClick={this.onToggle} onKeyDown={this.onToggle} tabIndex={0}> <div ref={this.setTargetRef} className='emoji-button' title={title} aria-label={title} aria-expanded={active} role='button' onClick={this.onToggle} onKeyDown={this.onToggle} tabIndex={0}>
{button || <img {button || <img
className={classNames('emojione', { 'pulse-loading': active && loading })} className={classNames('emojione', { 'pulse-loading': active && loading })}
alt='🙂' alt='blobCat emoji'
src={`${assetHost}/emoji/1f602.svg`} src='https://catcatnya.com/custom_emojis/images/000/002/356/static/blobCat.png'
/>} />}
{/* TODO: Fetch :blobCat: From custom_emojis directly */}
</div> </div>
<Overlay show={active} placement={placement} target={this.findTarget}> <Overlay show={active} placement={placement} target={this.findTarget}>