Update asset structure with webpacker gem #1962
Conversation
There was a problem hiding this comment.
Looks good @Bodacious. We should go through all of the selectors to see if the rules are still applicable. We should also review the image assets and see if we still need to hang onto them in the codebase (e.g. I think that swf file is no longer needed).
Those can and should be handled by other tickets, so lets get this one merged after @xsrust reviews
app/javascript/README.md
Outdated
| and for production, please type: | ||
|
|
||
| ``` | ||
| npm run bundle -- -p |
There was a problem hiding this comment.
would be good to add the --no-watch arg as well, or mention it somewhere here
| @@ -0,0 +1,16 @@ | |||
| module.exports = (number, index) => [ | |||
| ['just now', 'right now'], | |||
| ['less than a minute ago', 'in %s seconds'], | |||
There was a problem hiding this comment.
These values are not in our localization files. We should probably look at how best to accomplish that. We've been using the getConstant method but maybe there's a better way
There was a problem hiding this comment.
Want to create an issue for that?
| @@ -112,7 +98,9 @@ class Application < Rails::Application | |||
| config.active_record.raise_in_transactional_callbacks = true | |||
|
|
|||
| # Load Branded terminology (e.g. organization name, application name, etc.) | |||
| config.branding = config_for(:branding).deep_symbolize_keys | |||
| if File.exists?(Rails.root.join('config', 'branding.yml')) | |||
| @import "font-awesome-sprockets"; | ||
| @import "font-awesome"; | ||
| @import "variables/*"; | ||
| @import "utils/*"; |
There was a problem hiding this comment.
Thinking this might be a copy/paste issue. You've imported utils twice
| @@ -0,0 +1,7 @@ | |||
| @media (min-width: 768px) { | |||
| #admin-dropdown ul li a, #super-admin-dropdown ul li a { | |||
| line-height: 26px !important; | |||
There was a problem hiding this comment.
Would probably be safe to convert this one over to .dropdown or one of the other generic bootstrap selectors
(Colour variables aren't being set properly)
|
Probably worth merging this soon as its getting hard to review with all the different file changes. |
|
bundle audit fails on a Loofah vulnerability that was just patched yesterday. flavorjones/loofah#154. I'll merge this and submit the update of that dependency (and an updated version number) in a separate PR |
Updates the asset management changes in #1864 to include the latest changes from the
developmentbranch.