Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Bot nameplates (#7391)

Browse source 
* Store actor type in database

* Add bot nameplate to web UI, add setting to preferences, API, AP
Fix #7365

* Fix code style issues
This commit is contained in:
Eugen Rochko 2018-05-07 09:31:07 +02:00 • committed by GitHub
parent 0f0cc3f2eb
commit 42cd363542
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 48 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/javascript/mastodon/features/account/components/header.js
View file

@ -131,6 +131,7 @@ export default class Header extends ImmutablePureComponent {
const content = { __html: account.get('note_emojified') };
const displayNameHtml = { __html: account.get('display_name_html') };
const fields = account.get('fields');
const badge = account.get('bot') ? (<div className='roles'><div className='account-role bot'><FormattedMessage id='account.badges.bot' defaultMessage='Bot' /></div></div>) : null;
return (
<div className={classNames('account__header', { inactive: !!account.get('moved') })} style={{ backgroundImage: `url(${account.get('header')})` }}>
@ -139,6 +140,9 @@ export default class Header extends ImmutablePureComponent {
<span className='account__header__display-name' dangerouslySetInnerHTML={displayNameHtml} />
<span className='account__header__username'>@{account.get('acct')} {lockedIcon}</span>
{badge}
<div className='account__header__content' dangerouslySetInnerHTML={content} />
{fields.size > 0 && (

6
app/javascript/styles/mastodon/components.scss
View file

@ -5159,6 +5159,12 @@ noscript {
}
}
.account__header .roles {
margin-top: 20px;
margin-bottom: 20px;
padding: 0 15px;
}
.account__header .account__header__fields {
font-size: 14px;
line-height: 20px;

4
app/javascript/styles/mastodon/forms.scss
View file

@ -87,6 +87,10 @@ code {
align-items: flex-start;
}
&.file .label_input {
flex-wrap: nowrap;
}
&.select .label_input {
align-items: initial;
}