diff --git a/app/application.js b/app/application.js index 906247ea3..910d2af8d 100644 --- a/app/application.js +++ b/app/application.js @@ -1,7 +1,11 @@ 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(() => { require('./soapbox/main').default(); diff --git a/app/soapbox/common.js b/app/soapbox/common.js deleted file mode 100644 index b0c6f87d8..000000000 --- a/app/soapbox/common.js +++ /dev/null @@ -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 - } -};