-
Notifications
You must be signed in to change notification settings - Fork 70
Conversation
Branch has conflicts and also I'm getting an error when compiling:
|
I think I know why the errors are showing for you. I’ll take a look at that and the conflicts when I’m back at my computer |
heading_level: | ||
"1" | ||
heading_content: | ||
"Ithaca College Style Guide" |
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.
This should probably be changed to say Emulsify Style Guide along with the other heading levels
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.
Ditto.
@ModulesUnraveled I've reviewed this branch and merged in If you make the header change that @ccjjmartin commented about above we can get this merged. |
@amazingrando it looks like a couple main menu templates also made their way in. We'll probably want them in eventually, but we don't have the menu component in PL yet, so we shouldn't add the Drupal templates yet. |
@ModulesUnraveled You must've reviewed the files in that small window between me pushing the merge and then pushing a clean up to remove those pesky menu files. See |
I added a menu component - is that what you’re talking about? If so we need
those in there.
|
@evanmwillhite @ModulesUnraveled For the purposes of this PR do we need the menu files? Or should that be a separate PR? |
@ModulesUnraveled Would you update the description of this PR to include a checklist of what needs to be done for this branch to be considered complete? (Or link to a relevant issue?) Thanks! |
The menu files have already been merged in (you got it in here when you merged in develop). I just want to make sure they don't get removed here. |
@evanmwillhite @amazingrando Oh man... it looks like a lot of stuff got merged in that shouldn't have. This was supposed to be a ground up rewrite. A very intentional "Here's what we want to keep" PR... I'd like to revert back to before we merged develop and create individual PRs for each component that should get it (e.g. the menus). I think by merging develop we just included a bunch of stuff that hasn't been thoroughly picked through to validate code quality/convention. |
As we mentioned in an meeting outside of Github, I'll rollback the merge. |
2ac802a
to
257f157
Compare
@ModulesUnraveled When you get a chance, can you confirm if this branch is in the state that you'd like it to be in? TY. |
Does this need to be closed in favor of smaller PRs? |
@evanmwillhite I vote to close this. Work for this could be its own feature branch that has smaller PRs pulled against it. |
Yeah, this should probably be closed. :( I took too long to get things going, and now there's too much out-of-date |
This PR is the base branch that will contain all work on overhauling the default components that will come with Emulsify now that we're building it out to be an "example" theme.
So far, here is what has been done:
Deleted everything, and then built the following from the ground up.
Note:
Future PRs will be based against this branch so the diff will just show the new stuff