autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move background colour auto-detect script to where the other webpack files are

Browse Source
This commit is contained in:
Emma Winston 2019-09-18 21:26:33 +01:00
parent 20e17e496f
commit ec0a3e232d
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/components/error_boundary.js
View File

@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import defaultmascotlight from '../../images/defaultmascotlight.svg'; import defaultmascotlight from '../../images/defaultmascotlight.svg';
import defaultmascotdark from '../../images/defaultmascotdark.svg'; import defaultmascotdark from '../../images/defaultmascotdark.svg';
import {svgSelect} from '../features/compose/util/svg_select'; import {svgSelect} from '../svg_select';
export default class ErrorBoundary extends React.PureComponent { export default class ErrorBoundary extends React.PureComponent {

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

@ -15,7 +15,6 @@ import { changeComposing } from '../../actions/compose';
import defaultmascotlight from '../../../images/defaultmascotlight.svg'; import defaultmascotlight from '../../../images/defaultmascotlight.svg';
import defaultmascotdark from '../../../images/defaultmascotdark.svg'; import defaultmascotdark from '../../../images/defaultmascotdark.svg';
import { mascot } from '../../initial_state'; import { mascot } from '../../initial_state';
import {svgSelect} from './util/svg_select';
import Icon from 'mastodon/components/icon'; import Icon from 'mastodon/components/icon';
const messages = defineMessages({ const messages = defineMessages({
@ -38,7 +37,7 @@ let instanceMascot;
if (mascot) { if (mascot) {
instanceMascot = <img alt='' draggable='false' src={mascot} />; instanceMascot = <img alt='' draggable='false' src={mascot} />;
} else { } else {
instanceMascot = <img alt='' draggable='false' className="defaultmascot" src={svgSelect(defaultmascotlight, defaultmascotdark)} />; instanceMascot = <img alt='' draggable='false' className="defaultmascot" src={defaultmascotdark} />;
} }
export default @connect(mapStateToProps) export default @connect(mapStateToProps)

0
app/javascript/mastodon/features/compose/util/svg_select.js → app/javascript/mastodon/svg_select.js
View File