Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

updated origami build services #47

Merged
merged 7 commits into from
Apr 27, 2022
Merged

updated origami build services #47

merged 7 commits into from
Apr 27, 2022

Conversation

JALWilliams
Copy link
Contributor

@JALWilliams JALWilliams commented Apr 13, 2022 •
edited
Loading

  • Updated to origami build services from v2 to v3
  • Updated individual origami components versions

Issue: #44

emmalewis
emmalewis requested changes Apr 20, 2022
View reviewed changes
Copy link
Contributor

@emmalewis emmalewis left a comment

Choose a reason for hiding this comment

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

I think on here we also need to remove the bower components - let's talk about it together tomorrow?

emmalewis
emmalewis approved these changes Apr 25, 2022
View reviewed changes
Copy link
Contributor

@emmalewis emmalewis left a comment

Choose a reason for hiding this comment

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

This is great, just a couple of places to remove comments, but once you've done that I'm happy for this to be merged. Great job!

client/styles/main.scss Outdated
@import "o-forms/main";
// @import "o-fonts/main";
// @import "o-grid/main";
// @import "o-forms/main";
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's just remove these commented out lines

client/styles/main.scss Outdated

@import "origami-overrides/o-footer";
@import "origami-overrides/o-forms";

@import "var";
@import "mixins";

@import "sass-mq/mq";
// @import "sass-mq/mq";
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's remove this

emmalewis
emmalewis approved these changes Apr 27, 2022
View reviewed changes
Copy link
Contributor

@emmalewis emmalewis left a comment

Choose a reason for hiding this comment

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

🎉 Feel free to merge this once you're happy. I think the heroku/github issue is still a problem so it won't actually deploy - I'll speak to you about how we can make sure we get around that in time for our meeting with Andrew and Martin week after next.

@JALWilliams JALWilliams merged commit 81af67a into main Apr 27, 2022
@JALWilliams JALWilliams deleted the updating-origami-build branch April 27, 2022 14:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emmalewis emmalewis emmalewis approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JALWilliams @emmalewis