tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/better-themeing' into merging-upstream

Browse Source
This commit is contained in:
Ondřej Hruška
2017-09-28 09:20:59 +02:00
parent 83bda6c1a8 f7ca205f38
commit daad07b1d5
25 changed files with 116 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/packs/application.js
View File

@@ -2,7 +2,7 @@ import loadPolyfills from '../mastodon/load_polyfills';
// import default stylesheet with variables
require('font-awesome/css/font-awesome.css');
require('mastodon-application-style');
import 'styles/application';
require.context('../images/', true);

16
app/javascript/packs/frontends/mastodon.js
View File

@@ -1,16 +0,0 @@
// This file replaces `app/javascript/packs/application.js` for use
// with multiple frontends.
import loadPolyfills from '../../mastodon/load_polyfills';
// import default stylesheet with variables
require('font-awesome/css/font-awesome.css');
require('mastodon-application-style');
require.context('../../images/', true);
loadPolyfills().then(() => {
require('../../mastodon/main').default();
}).catch(e => {
console.error(e);
});