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

add project studio stuff on home page #17

Merged
merged 5 commits into from
Jul 27, 2023
Merged

add project studio stuff on home page #17

merged 5 commits into from
Jul 27, 2023

Conversation

ajskateboarder
Copy link
Contributor

@ajskateboarder ajskateboarder commented Jul 26, 2023

image

🚀 🚀 🚀 🚀

This might cause a merge conflict with EngineerRunner's fork

@ajskateboarder
Copy link
Contributor Author

Oh and I had an absolutely miserable time editing the same CSS across multiple files
Hopefully a base CSS file comes around :)

@Darth-Ness
Copy link
Collaborator

In #16 I asked if that would be wanted. If so, I can start on a PR.

@redstone-dev
Copy link
Collaborator

Oh and I had an absolutely miserable time editing the same CSS across multiple files Hopefully a base CSS file comes around :)

Okay I won't delete the master-styles file, I'm going to reopen #16 lol

@redstone-dev
Copy link
Collaborator

redstone-dev commented Jul 27, 2023

I'm going to focus on getting the subforum-rework branch merged ASAP then I'll focus on PRs and issues

Will open once I get back to it

I merged it 🎉

@EngineerRunner
Copy link
Collaborator

ima merge the project page PR and see if I can resolve any conflicts with this

@ajskateboarder
Copy link
Contributor Author

ajskateboarder commented Jul 27, 2023

There were some conflicts on my fork after redstone merged subform-rework, and it should be fixed now

Oh and I forgot to mention that I made some changes to the gruvbox CSS for consistency, like making the logo in the navbar the same color as the glow whenever you hover over it

image

@EngineerRunner EngineerRunner merged commit e62ab96 into SnarpleDev:main Jul 27, 2023
@redstone-dev
Copy link
Collaborator

There were some conflicts on my fork after redstone merged subform-rework, and it should be fixed now

Oof sorry

Oh and I forgot to mention that I made some changes to the gruvbox CSS for consistency, like making the logo in the navbar the same color as the glow whenever you hover over it

Nice

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

Successfully merging this pull request may close these issues.

4 participants