]> cat aescling's git repositories - mastodon.git/commit
Add support for multiple themes (#4959)
authorAndrew <andrewLchronister@gmail.com>
Tue, 19 Sep 2017 14:36:23 +0000 (07:36 -0700)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 19 Sep 2017 14:36:23 +0000 (16:36 +0200)
commit0401a24558294b6941c30c922af3f2063dfd305e
treef40ee4baffd7f567cb11f9a3c162c2e1c4907534
parent4aea3f88a6d30f102a79c2da7fcfac96465ba1a8
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
15 files changed:
app/controllers/application_controller.rb
app/controllers/settings/preferences_controller.rb
app/javascript/packs/common.js
app/lib/themes.rb [new file with mode: 0644]
app/lib/user_settings_decorator.rb
app/models/user.rb
app/views/layouts/application.html.haml
app/views/layouts/embedded.html.haml
app/views/settings/preferences/show.html.haml
config/locales/en.yml
config/locales/simple_form.en.yml
config/settings.yml
config/themes.yml [new file with mode: 0644]
config/webpack/configuration.js
config/webpack/shared.js