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.

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

fix visual elements on the frontpage #200

Merged
merged 4 commits into from
Dec 12, 2024

Conversation

Majapur1
Copy link
Collaborator

@Majapur1 Majapur1 commented Dec 6, 2024

  • add small changes in alignment and element colors on the frontpage following the Sabina's comments

889fe95

@Majapur1 Majapur1 added duplicate This issue or pull request already exists frontend labels Dec 6, 2024
@Majapur1 Majapur1 requested a review from lkeegan December 6, 2024 11:56
@Majapur1 Majapur1 self-assigned this Dec 6, 2024
Copy link
Member

@lkeegan lkeegan left a comment

Choose a reason for hiding this comment

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

@Majapur1 is it just the changes in 889fe95 that you want to make here?

@Majapur1
Copy link
Collaborator Author

@lkeegan at that moment — yes. I met Sabina this week. She gave me additional comments and already approved the changes (including a new element) after reviewing them on my local machine.

You can merge this step, and I'll create another branch for the new ones.

@lkeegan
Copy link
Member

lkeegan commented Dec 12, 2024

Thanks - this can't be merged as is due to merge conflicts:
image
Maybe you could try to resolve these (a good skill to learn when working with git!), see e.g. https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line

Otherwise let me know and I can extract that single commit and merge it.

@codecov-commenter
Copy link

codecov-commenter commented Dec 12, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 34.60%. Comparing base (de3f78d) to head (fe4dbd9).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #200   +/-   ##
=======================================
  Coverage   34.60%   34.60%           
=======================================
  Files         109      109           
  Lines        3742     3742           
  Branches       94       94           
=======================================
  Hits         1295     1295           
  Misses       2368     2368           
  Partials       79       79           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@Majapur1 Majapur1 merged commit f847c70 into main Dec 12, 2024
7 checks passed
@Majapur1 Majapur1 deleted the frontpage-colors-and-alignment-fix branch December 12, 2024 13:17
@Majapur1
Copy link
Collaborator Author

@lkeegan thanks for this lesson! Now I understand how it works and why some changes cannot be just merged into main.

That was really helpful!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
duplicate This issue or pull request already exists frontend
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants