-
Notifications
You must be signed in to change notification settings - Fork 3
Cleanup macros #134
base: master
Are you sure you want to change the base?
Cleanup macros #134
Conversation
Removed some copy pasted code from various macros
Renamed file to be consistent with other macros Moved from base.njk as it wasn't being used outside of macros Moved if statement into macro as it was always included with macro call Explicitly add to each macro as an import
Macros that are only included in other macros are now in the sub-imports folder
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add some notes in the Changelog under the latest (we haven't tagged that release yet)
Changelog has been updated |
@CalvinRodo feel free to merge. |
Oy, okay, just seeing this now. It's going to be a bit of work to integrate this. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jneen do you want to hold off on this?
Holding for @jneen to review. |
I think that might be best - this seems easier to rebase against my changes. The only major thing that would have to change is the |
Did some light cleanup work in the macros to remove some copy and pasted sections and pull them into their own macros should improve maintainability.
I also moved macros that are only included in other macros into
sub-macros
folder (I can't think of a better name right now).These could also be mashed up into a single file and import from there instead of having 3 imports in each file. However I've got some old baggage from my C# days about having only one thing per file.