diff options
| author | Gô Shoemake <marrus-sh@users.noreply.github.com> | 2017-07-30 10:28:21 -0700 |
|---|---|---|
| committer | Ondřej Hruška <ondra@ondrovo.com> | 2017-07-30 19:28:21 +0200 |
| commit | b61e3daf983d87c6d2de7e54d420c2e8f5a531e6 (patch) | |
| tree | 97836a37b38cc664862f9a6ebda311e3410df09c /app/javascript/packs/common.js | |
| parent | 6ff084dbbb06e5c2f131546829066435f2bf8f8a (diff) | |
Multiple frontend support (#110)
* Initial multiple frontend support * Removed unnecessary require() * Moved styles/images out of common
Diffstat (limited to 'app/javascript/packs/common.js')
| -rw-r--r-- | app/javascript/packs/common.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js index ba7053f1f..de0c68fa5 100644 --- a/app/javascript/packs/common.js +++ b/app/javascript/packs/common.js @@ -1,9 +1,6 @@ import { start } from 'rails-ujs'; -// import default stylesheet with variables -require('font-awesome/css/font-awesome.css'); -require('mastodon-application-style'); - -require.context('../images/', true); +// import common styling +require('../styles/common.scss'); start(); |