diff options
| author | Andrew <andrewLchronister@gmail.com> | 2017-09-19 07:36:23 -0700 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-09-19 16:36:23 +0200 |
| commit | 0401a24558294b6941c30c922af3f2063dfd305e (patch) | |
| tree | f40ee4baffd7f567cb11f9a3c162c2e1c4907534 /app/javascript/packs | |
| parent | 4aea3f88a6d30f102a79c2da7fcfac96465ba1a8 (diff) | |
Add support for multiple themes (#4959)
* Add support for selecting a theme * Fix codeclimate issues * Look up site default style if current user is not available due to e.g. not being logged in * Remove outdated comment in common.js * Address requested changes in themes PR * Fix codeclimate issues * Explicitly check current_account in application controller and only check theme availability if non-nil * codeclimate * explicit precedence with && * Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml * codeclimate: indentation + return
Diffstat (limited to 'app/javascript/packs')
| -rw-r--r-- | app/javascript/packs/common.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/app/javascript/packs/common.js b/app/javascript/packs/common.js index ba7053f1f..4880f0242 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); start(); |