diff options
author | Ondřej Hruška <ondra@ondrovo.com> | 2017-10-16 22:24:44 +0200 |
---|---|---|
committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-10-16 22:24:44 +0200 |
commit | 37ff061d9bf0a91da6580960be01e3c6bc5e5c4c (patch) | |
tree | fb5d8ed08dc130607fd7fd31c67b7cad4ebfd8f5 /app/javascript/packs/application.js | |
parent | 8b9ee5f16bac8b53d56ac7d9974275658305803e (diff) |
satisfy eslint and jest
Diffstat (limited to 'app/javascript/packs/application.js')
-rw-r--r-- | app/javascript/packs/application.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/packs/application.js b/app/javascript/packs/application.js index aa94006c6..d275c3bb0 100644 --- a/app/javascript/packs/application.js +++ b/app/javascript/packs/application.js @@ -2,7 +2,8 @@ import loadPolyfills from '../mastodon/load_polyfills'; // import default stylesheet with variables require('font-awesome/css/font-awesome.css'); -import 'styles/application'; + +import '../styles/application.scss'; require.context('../images/', true); |