bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge conflict.

Browse source
This commit is contained in:
Sean King 2020-08-02 20:47:52 +00:00
commit 49b8ecd639
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/soapbox/features/configuration/index.js
View file

@ -12,6 +12,7 @@ import {
Checkbox, Checkbox,
FileChooser, FileChooser,
ColorWithPicker, ColorWithPicker,
FileChooserLogo,
} from 'soapbox/features/forms'; } from 'soapbox/features/forms';
import StillImage from 'soapbox/components/still_image'; import StillImage from 'soapbox/components/still_image';
import { import {
@ -262,7 +263,7 @@ class ConfigSoapbox extends ImmutablePureComponent {
{this.state.logo ? (<StillImage src={this.state.logo || ''} />) : (<StillImage src={this.props.logo || ''} />)} {this.state.logo ? (<StillImage src={this.state.logo || ''} />) : (<StillImage src={this.props.logo || ''} />)}
</div> </div>
<div className='fields-row__column fields-group fields-row__column-6'> <div className='fields-row__column fields-group fields-row__column-6'>
<FileChooser <FileChooserLogo
label={<FormattedMessage id='soapbox_settings.fields.logo_label' defaultMessage='Logo' />} label={<FormattedMessage id='soapbox_settings.fields.logo_label' defaultMessage='Logo' />}
name='logo' name='logo'
hint={<FormattedMessage id='soapbox_settings.hints.logo' defaultMessage='SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio' />} hint={<FormattedMessage id='soapbox_settings.hints.logo' defaultMessage='SVG. At most 2 MB. Will be downscaled to 50px height, maintaining aspect ratio' />}

8
app/soapbox/features/forms/index.js
View file

@ -320,3 +320,11 @@ export const FileChooser = props => (
FileChooser.defaultProps = { FileChooser.defaultProps = {
accept: ['image/jpeg', 'image/png', 'image/gif', 'image/webp'], accept: ['image/jpeg', 'image/png', 'image/gif', 'image/webp'],
}; };
export const FileChooserLogo = props => (
<SimpleInput type='file' {...props} />
);
FileChooserLogo.defaultProps = {
accept: ['image/svg', 'image/png'],
};