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

Convert about and contacts pages #86

Merged
merged 3 commits into from
Oct 23, 2024
Merged

Convert about and contacts pages #86

merged 3 commits into from
Oct 23, 2024

Conversation

molinaro-m
Copy link
Member

should fix #60 and #2 (partly)

@molinaro-m
Copy link
Member Author

Added the contacts page
I'll work out the members-contact now (even if it is linked to this explicitly)

@molinaro-m molinaro-m mentioned this pull request Sep 30, 2024
Open
@gmantele @molinaro-m
Add a shortcode for floating (left or right) content
0f09a5f
@gmantele @molinaro-m
Add a shortcode for paragraph with a side image (left or right).
7380712 
This shortcode is a bit different from the `floating` shortcode. The content
is not floating around the image, but is rather visually put on a separate
column.
@molinaro-m
Copy link
Member Author

Hi @JeremyMcCormick , @gmantele
This is now rebased on the shortcodes additions (even if not using them).
Please, check whether it's OK to merge it.

@molinaro-m molinaro-m mentioned this pull request Oct 15, 2024
Merged
@JeremyMcCormick
Copy link
Collaborator

Hi @JeremyMcCormick , @gmantele This is now rebased on the shortcodes additions (even if not using them). Please, check whether it's OK to merge it.

It seems like the short code changes were not rebased out. I still see them in the commit log.

You might need to git fetch origin first?

@JeremyMcCormick JeremyMcCormick self-requested a review October 15, 2024 20:14
@JeremyMcCormick JeremyMcCormick changed the title md translated about/contacts page Port about and contacts pages Oct 15, 2024
@JeremyMcCormick JeremyMcCormick changed the title Port about and contacts pages Convert about and contacts pages Oct 15, 2024
@molinaro-m
Copy link
Member Author

I think I get what's the issue here (my fault).
There's the branch on origin that diverged from my local due to rebasing and merging.
I wonder if there's a solution or if its better I drop this PR, delete and redo the branches, and then restart the merge request from a clean situation.

@JeremyMcCormick
Copy link
Collaborator

I think I get what's the issue here (my fault).

There's the branch on origin that diverged from my local due to rebasing and merging.

I wonder if there's a solution or if its better I drop this PR, delete and redo the branches, and then restart the merge request from a clean situation.

I mentioned this on the other PR - just drop the shortcode commits entirely using a rebase. Should work fine I think...

JeremyMcCormick
JeremyMcCormick approved these changes Oct 16, 2024
View reviewed changes
Copy link
Collaborator

@JeremyMcCormick JeremyMcCormick left a comment

Choose a reason for hiding this comment

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

This looks fine in preview.

There are additional commits showing up that are already on main but it shouldn't be a problem. Doing git diff main on this branch shows only the page update. No conflicts should occur when merging.

@molinaro-m molinaro-m merged commit c77f8b4 into main Oct 23, 2024
1 check passed
@molinaro-m molinaro-m deleted the iss60 branch October 23, 2024 11:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

Add contacts page
3 participants
@molinaro-m @JeremyMcCormick @gmantele