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

Changes to the component code to follow coffee theme #643

Merged
merged 1 commit into from
Nov 30, 2023
Merged

Changes to the component code to follow coffee theme #643

merged 1 commit into from
Nov 30, 2023

Conversation

GCHQ-Developer-398
Copy link

Summary of the changes

Changes to the component code and guidance, to follow the coffee theme.

Related issue

#590

Checklist

@github-actions
Copy link

View your branch deployment here: https://animated-fiesta-gvyom1k.pages.github.io/branches/590-component-code-follows-coffee-theme

@github-actions
Copy link

Your PR was set to target main, PRs should be target develop
The base branch of this PR has been automatically changed to develop, please check that there are no merge conflicts

@github-actions github-actions bot changed the base branch from main to develop October 16, 2023 10:24
@GCHQ-Developer-398 GCHQ-Developer-398 force-pushed the 590-component-code-follows-coffee-theme branch from 7d46741 to e2ea8c7 Compare October 16, 2023 10:46
@GCHQ-Developer-398 GCHQ-Developer-398 changed the title Changes to the component code to follow coffee theme #590 Changes to the component code to follow coffee theme Oct 16, 2023
@GCHQ-Developer-398 GCHQ-Developer-398 self-assigned this Oct 16, 2023
GCHQ-Developer-299
GCHQ-Developer-299 requested changes Oct 16, 2023
View reviewed changes
Copy link
Contributor

@GCHQ-Developer-299 GCHQ-Developer-299 left a comment

Choose a reason for hiding this comment

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

I've left several comments - mostly typos, one suggestion

GCHQ-Developer-530
GCHQ-Developer-530 requested changes Oct 16, 2023
View reviewed changes
Copy link
Contributor

@GCHQ-Developer-530 GCHQ-Developer-530 left a comment

Choose a reason for hiding this comment

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

Looks good, the changes are mostly typos. I also think that chips should be updated to use coffee themes as dismissible for chips says default, but dismissible for cards is coffee themed, so just adds to the consistency if chips is updated.

@GCHQ-Developer-530
Copy link
Contributor

Your commits will need squashing into 1. Here's an online guide on how to do that: https://www.freecodecamp.org/news/git-squash-commits/

GCHQ-Developer-398
GCHQ-Developer-398 commented Oct 16, 2023
View reviewed changes
Copy link
Author

@GCHQ-Developer-398 GCHQ-Developer-398 left a comment

Choose a reason for hiding this comment

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

I have now made all of these changes

@GCHQ-Developer-398 GCHQ-Developer-398 force-pushed the 590-component-code-follows-coffee-theme branch from 6c78152 to 29e7661 Compare October 16, 2023 13:42
GCHQ-Developer-530
GCHQ-Developer-530 reviewed Oct 16, 2023
View reviewed changes
@GCHQ-Developer-398 GCHQ-Developer-398 force-pushed the 590-component-code-follows-coffee-theme branch 2 times, most recently from b7519ba to 89ee50d Compare October 16, 2023 15:08
@GCHQ-Developer-530 GCHQ-Developer-530 force-pushed the 590-component-code-follows-coffee-theme branch 2 times, most recently from b1e7cba to 50ae499 Compare October 18, 2023 08:21
DBD324
DBD324 suggested changes Oct 18, 2023
View reviewed changes
@GCHQ-Developer-398 GCHQ-Developer-398 force-pushed the 590-component-code-follows-coffee-theme branch from 50ae499 to 7635a6a Compare October 26, 2023 19:30
@GCHQ-Developer-398 GCHQ-Developer-398 force-pushed the 590-component-code-follows-coffee-theme branch 3 times, most recently from 876dc69 to 9064ba4 Compare November 6, 2023 10:25
@GCHQ-Developer-398 GCHQ-Developer-398 dismissed GCHQ-Developer-299’s stale review November 22, 2023 13:23

The merge-base changed after approval.

DBD324
DBD324 suggested changes Nov 22, 2023
View reviewed changes
@GCHQ-Developer-398 GCHQ-Developer-398 force-pushed the 590-component-code-follows-coffee-theme branch 2 times, most recently from 3451d09 to 6ac7ac1 Compare November 23, 2023 14:55
@GCHQ-Developer-530 GCHQ-Developer-530 marked this pull request as draft November 27, 2023 15:34
@GCHQ-Developer-398 GCHQ-Developer-398 force-pushed the 590-component-code-follows-coffee-theme branch 3 times, most recently from bf15dee to b11837a Compare November 27, 2023 17:43
@GCHQ-Developer-398 GCHQ-Developer-398 force-pushed the 590-component-code-follows-coffee-theme branch 2 times, most recently from b9ea6a5 to 1ea693a Compare November 27, 2023 18:20
@GCHQ-Developer-530 GCHQ-Developer-530 force-pushed the 590-component-code-follows-coffee-theme branch 2 times, most recently from 382d758 to 318e5c4 Compare November 30, 2023 09:33
@GCHQ-Developer-530 GCHQ-Developer-530 marked this pull request as ready for review November 30, 2023 10:11
@GCHQ-Developer-530 GCHQ-Developer-530 force-pushed the 590-component-code-follows-coffee-theme branch from 318e5c4 to 29e5981 Compare November 30, 2023 11:28
DBD324
DBD324 previously approved these changes Nov 30, 2023
View reviewed changes
Copy link
Contributor

@DBD324 DBD324 left a comment

Choose a reason for hiding this comment

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

Looks fantastic, thanks very much.

@GCHQ-Developer-530 @GCHQ-Developer-398
chore(root): changes made to component code to follow coffee theme
82c8eba 
Changes made to component code and guidance examples to follow coffee theme

re #590
@GCHQ-Developer-398 GCHQ-Developer-398 force-pushed the 590-component-code-follows-coffee-theme branch from 29e5981 to 82c8eba Compare November 30, 2023 13:19
@GCHQ-Developer-530 GCHQ-Developer-530 merged commit 94e11fd into develop Nov 30, 2023
@GCHQ-Developer-530 GCHQ-Developer-530 deleted the 590-component-code-follows-coffee-theme branch November 30, 2023 14:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GCHQ-Developer-299 GCHQ-Developer-299 GCHQ-Developer-299 approved these changes

@GCHQ-Developer-847 GCHQ-Developer-847 GCHQ-Developer-847 approved these changes

@DBD324 DBD324 DBD324 approved these changes

@GCHQ-Developer-530 GCHQ-Developer-530 Awaiting requested review from GCHQ-Developer-530

Assignees

@GCHQ-Developer-398 GCHQ-Developer-398

Labels
None yet
Projects
Intelligence Community Design System
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@GCHQ-Developer-398 @GCHQ-Developer-530 @GCHQ-Developer-299 @GCHQ-Developer-847 @DBD324