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 /config/webpack/configuration.js | |
| 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 'config/webpack/configuration.js')
| -rw-r--r-- | config/webpack/configuration.js | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/config/webpack/configuration.js b/config/webpack/configuration.js index 6ef484c3a..822329490 100644 --- a/config/webpack/configuration.js +++ b/config/webpack/configuration.js @@ -9,6 +9,9 @@ const configPath = resolve('config', 'webpacker.yml'); const loadersDir = join(__dirname, 'loaders'); const settings = safeLoad(readFileSync(configPath), 'utf8')[env.NODE_ENV]; +const themePath = resolve('config', 'themes.yml'); +const themes = safeLoad(readFileSync(themePath), 'utf8'); + function removeOuterSlashes(string) { return string.replace(/^\/*/, '').replace(/\/*$/, ''); } @@ -29,6 +32,7 @@ const output = { module.exports = { settings, + themes, env, loadersDir, output, |