about summary refs log tree commit diff
path: root/app/javascript/packs/application.js
diff options
context:
space:
mode:
authorkibigo! <marrus-sh@users.noreply.github.com>2017-09-25 19:24:32 -0700
committerkibigo! <marrus-sh@users.noreply.github.com>2017-09-25 19:24:32 -0700
commit86e617a839bd4eb45ace52ab226a4e93bb184ff0 (patch)
tree63e4513681af278474c2da1e592a13a6043719b2 /app/javascript/packs/application.js
parentc2b479efecf1ce1f4a45e626963b7ce7e203b8d6 (diff)
Better themeing support!!
Diffstat (limited to 'app/javascript/packs/application.js')
-rw-r--r--app/javascript/packs/application.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js
index c06714dc1..aa94006c6 100644
--- a/app/javascript/packs/application.js
+++ b/app/javascript/packs/application.js
@@ -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);