Create Home Page for Website #17
Conversation
I have created a home page for the website. I have added an image folder for the image and add a CSS folder for the styling purpose.
|
Enable the checklist, add the output screenshot and issue number you got allotted to in format given. Use edit option to correct the PR message. @codervivek5 |
|
@codervivek5 Pull all the changes and commit once more to resolve merge conflicts |
|
@codervivek5, drop me a message. There are few things to discuss with respect to your PR. @unnikrishnan2002, thanks for your timely suggestion to your mate |
|
I have made all the changes, Enable the checklist, add the output screenshot and issue number. |
|
|
@unnikrishnan2002 how will I do it? I don't know about it. |
|
There is a correction to clear out few things in PR. Kindly drop a message in discord @codervivek5 |
|
I provided the video to resolve merge conflicts. It's in pinned messages you can check it. And there are corrections in your PR. So reach out to me once @codervivek5 |
adjust size and position of the search box
|
Come on discussion @codervivek5 |
|
@codervivek5 your pr has merge conflicts- would you mind resolving them? |
|
This is so confusing to use. I have done my work but it is on my local PC. how can I add more new changes to my code so that you can see how it is looking and what we have to change on there. |
index.html
Outdated
| @@ -17,6 +17,10 @@ | |||
| <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.15.4/css/all.css" | |||
| integrity="sha384-DyZ88mC6Up2uqS4h/KRgHuoeGwBcD4Ng9SiP4dIRy0EXTlnuz47vAwmeGwVChigm" crossorigin="anonymous"> | |||
|
|
|||
| <!-- custome css for home page --> | |||
| <link rel="stylesheet" href="css/home_style.css"> | |||
There was a problem hiding this comment.
@codervivek5 you have to use styles.css to style the elements in index.html . Don't need to create a new css file . Put the css in styles. css file only
There was a problem hiding this comment.
Thanks @unnikrishnan2002 for being so helpful in supporting your fellow mentee. Appreciate your willingness to do so.
Are you able to do so @codervivek5
We have updated some changes in the home page design.
Update home page
this is extra file so we have to delete this file
We have to merge the deleted CSS file code of the home page to style.css file
…ile-code Update home page css
we have added some images for the design of the home page.
|
Reach out to me once on discord @codervivek5 |
|
Update please? @codervivek5 |
|
@prathimacode-hub why it is showing merge conflict again and again. |
|
because new PR's are merging then conflict raises up. Since code gets changes and ur forked repo drastically won't be even with main repo after Latest PR's are merged @codervivek5 |
I have done merge conflict........sorry I was busy for some time due to the sister's marriage now I am free for contribution. |
|
plz, check out PR. |
|
Can you update about this? @codervivek5 |
Sure ....but what we have to update.... |
|
Reach out to me once and there are merge conflicts too. @codervivek5 |
I have created a home page for the website. I have added an image folder for the image and add a CSS folder for the styling purpose.
Related Issue
Info about the related issue
JWOC Participant
Contributor
Closes: #2
Describe the changes you've made
Give a clear description what modifications you have made
Type of change
What sort of change have you made:
How Has This Been Tested?
Describe how have you verified the changes made
Checklist:
Screenshots