Made changes to the Sound of the Salish Sea section #58
Conversation
|
✔️ Deploy Preview for orcahome ready! 🔨 Explore the source changes: 7928a12 🔍 Inspect the deploy log: https://app.netlify.com/sites/orcahome/deploys/622f831d22793a0008bc71a4 😎 Browse the preview: https://deploy-preview-58--orcahome.netlify.app |
Updated next version from 12.0.10 to 12.0.9
|
I am able to do the theme based styling for the heading "Sailing of the Sea". But when I try to apply to the paragraph, it is not working. I have updated the Next JS version back to original. |
|
I created themes for both heading and paragraph. |
|
@Saksham294 are you still working on this PR? Is it ready to review? If so, go ahead and pull it out of draft status (mark it ready for review) and request my review |
Hey Paul I have made changes as per recommendations, like using ThemeProvider for fontSize and switching NextJS version back to original. You can review the changes made. |
There was a problem hiding this comment.
@Saksham294 thanks for your changes! I left a quick comment for you, but before I do a proper review can you merge in the latest changes from the main branch and fix the conflicts?
| const paragraph=createTheme(); | ||
| paragraph.typography.p={ | ||
| fontFamily:"Montserrat", | ||
| fontSize:'1.25rem', | ||
| fontWeight: '600' | ||
|
|
||
| } | ||
| const heading=createTheme(); | ||
| heading.typography.h1={ | ||
| fontFamily: 'Montserrat', | ||
| fontSize: '2.75rem', | ||
| fontWeight: '600' | ||
|
|
||
| } |
There was a problem hiding this comment.
This should go in the theme.ts file instead of creating new themes
There was a problem hiding this comment.
Ok I have made the requested changes. I think I have an older version of the project. So should I upload the changes from that branch or create a new branch with the latest version of the project?
There was a problem hiding this comment.
It's up to you how you want to do it, but what I would do is fetch/pull the latest changes into the main branch, switch to the feature branch, then run git merge main and fix the merge conflicts
There was a problem hiding this comment.
I fetched the latest changes but on my master branch, so there's a conflict now. So I created another local repo and made the required changes. It is the same. Can I upload the changes from a new branch now?
There was a problem hiding this comment.
That's completely up to you. It would be easiest to keep using this PR (if you're not sure how to deal with merge conflicts read this, it's an important skill to learn). But if you'd rather open a new PR that's fine too. You can also force push (git push -f) your newest code to this branch which will update this PR.
There was a problem hiding this comment.
I'll open a new PR as I find it easier as of now. I'll definitely read about merge conflicts and use it in future. Thank you
There was a problem hiding this comment.
I have made a new PR at the following link:#81
There was a problem hiding this comment.
Sounds good, go ahead and close this PR then if everything is in the other one now
With reference to the issue #42
I have used MUI sx props for styling the "Sounds of the Salish Sea" section of the Learn page.
I am attaching an image for the same below.