moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflict?

This commit is contained in:
Sean King 2020-09-28 20:29:41 -06:00
parent 21f68bf623
commit d512d06b27
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/application.js
View File

@ -1,7 +1,11 @@
import loadPolyfills from './soapbox/load_polyfills'; import loadPolyfills from './soapbox/load_polyfills';
import { start } from './soapbox/common';
start(); require('fork-awesome/css/fork-awesome.css');
require.context('./images/', true);
require('@fonticonpicker/react-fonticonpicker/dist/fonticonpicker.base-theme.react.css');
require('@fonticonpicker/react-fonticonpicker/dist/fonticonpicker.material-theme.react.css');
loadPolyfills().then(() => { loadPolyfills().then(() => {
require('./soapbox/main').default(); require('./soapbox/main').default();

16
app/soapbox/common.js
View File

@ -1,16 +0,0 @@
'use strict';
import Rails from 'rails-ujs';
export function start() {
require('fork-awesome/css/fork-awesome.css');
require('@fonticonpicker/react-fonticonpicker/dist/fonticonpicker.base-theme.react.css');
require('@fonticonpicker/react-fonticonpicker/dist/fonticonpicker.material-theme.react.css');
require.context('../images/', true);
try {
Rails.start();
} catch (e) {
// If called twice
}
};