Skip to content
This repository has been archived by the owner on Mar 31, 2023. It is now read-only.

Complete overhaul of components #150

Closed
wants to merge 21 commits into from
Closed

Conversation

ModulesUnraveled
Copy link
Contributor

@ModulesUnraveled ModulesUnraveled commented Sep 28, 2017

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.

  • base
    • global
      • colors/*
      • fonts/*
      • breakpoints.scss
      • variables.scss
      • mixins.scss
      • base.scss
  • atoms
    • headings/*
    • links/*

Note:

Future PRs will be based against this branch so the diff will just show the new stuff

@evanmwillhite
Copy link
Contributor

Branch has conflicts and also I'm getting an error when compiling:

configuring pattern lab...
PHP Warning:  file_get_contents(/Users/evanwillhite/Sites/static/emulsify/pattern-lab/source/_patterns/01-atoms/headings/01-heading.twig): failed to open stream: No such file or directory in /Users/evanwillhite/Sites/static/emulsify/pattern-lab/vendor/pattern-lab/core/src/PatternLab/Builder.php on line 264
PHP Warning:  file_get_contents(/Users/evanwillhite/Sites/static/emulsify/pattern-lab/source/_patterns/01-atoms/headings/02-heading.twig): failed to open stream: No such file or directory in /Users/evanwillhite/Sites/static/emulsify/pattern-lab/vendor/pattern-lab/core/src/PatternLab/Builder.php on line 264
PHP Warning:  file_get_contents(/Users/evanwillhite/Sites/static/emulsify/pattern-lab/source/_patterns/01-atoms/headings/03-heading.twig): failed to open stream: No such file or directory in /Users/evanwillhite/Sites/static/emulsify/pattern-lab/vendor/pattern-lab/core/src/PatternLab/Builder.php on line 264
PHP Warning:  file_get_contents(/Users/evanwillhite/Sites/static/emulsify/pattern-lab/source/_patterns/01-atoms/headings/04-heading.twig): failed to open stream: No such file or directory in /Users/evanwillhite/Sites/static/emulsify/pattern-lab/vendor/pattern-lab/core/src/PatternLab/Builder.php on line 264
PHP Warning:  file_get_contents(/Users/evanwillhite/Sites/static/emulsify/pattern-lab/source/_patterns/01-atoms/headings/05-heading.twig): failed to open stream: No such file or directory in /Users/evanwillhite/Sites/static/emulsify/pattern-lab/vendor/pattern-lab/core/src/PatternLab/Builder.php on line 264```

@ModulesUnraveled
Copy link
Contributor Author

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"
Copy link
Collaborator

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ditto.

@amazingrando
Copy link
Member

@ModulesUnraveled I've reviewed this branch and merged in develop to take care of the conflicts. I did not run into the issue that @evanmwillhite flagged above. (I ran Emulsify with npm and yarn to cover the bases.)

If you make the header change that @ccjjmartin commented about above we can get this merged.

@ModulesUnraveled
Copy link
Contributor Author

@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.

https://github.com/fourkitchens/emulsify/pull/150/files/257f157cc4474e62cfe94e9a37c1cbcd37134cf3..2ac802a7f7b233f4f7c9f308d027afd6ae47f514

@amazingrando
Copy link
Member

@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
2ac802a

@evanmwillhite
Copy link
Contributor

evanmwillhite commented Nov 11, 2017 via email

@amazingrando
Copy link
Member

@evanmwillhite @ModulesUnraveled For the purposes of this PR do we need the menu files? Or should that be a separate PR?

@amazingrando
Copy link
Member

@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!

@evanmwillhite
Copy link
Contributor

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.

@ModulesUnraveled
Copy link
Contributor Author

@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.

@amazingrando
Copy link
Member

As we mentioned in an meeting outside of Github, I'll rollback the merge.

@amazingrando
Copy link
Member

@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.

@evanmwillhite
Copy link
Contributor

Does this need to be closed in favor of smaller PRs?

@amazingrando
Copy link
Member

@evanmwillhite I vote to close this. Work for this could be its own feature branch that has smaller PRs pulled against it.

@ModulesUnraveled
Copy link
Contributor Author

Yeah, this should probably be closed. :( I took too long to get things going, and now there's too much out-of-date

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants