styled-home-page - Githubissues

KaizenGirl1111 / GSGrihSangini

A LinkedIn type platform but for low wage workers and maids!

gsg-rih-sangini-pi.vercel.app

MIT License

11 stars 19 forks source link

styled-home-page #102

Closed mayank-del closed 2 years ago

mayank-del commented 2 years ago

🛠️ Fixes #10

👨‍💻 Changes proposed

✔️ Check List (Check all the applicable boxes)

[ x] My code follows the code style of this project.
[x ] This PR does not contain plagiarized content.
[x ] The title of my pull request is a short description of the requested changes.

📄 Note to reviewers

I styled navbar which was very old fashioned. I also added animation on servicesContainer section, so that if you scroll the page towardsservicesContainer page it will fade.

📷 Screenshots

mayank-del commented 2 years ago

@KaizenGirl1111 maam, i have styled your scrollbar also and made it beautiful, please check these changes , I think ,I have done the desired changes.

KaizenGirl1111 commented 2 years ago

@mayank-del I'm eager to see your work, though your branch has some merge conflicts. Could you please recheck it?

mayank-del commented 2 years ago

@KaizenGirl1111 maam, Actually maam you can check in your main repo also, actually, in your codes lines like <<<<<<<<<<<<main Have been written and around 9-10 such things were present in both login as well as signup file , if I would not remove those unwanted lines they would never let the program run, that's why these conflicts are coming.

mayank-del commented 2 years ago

@KaizenGirl1111 mam, have you understood the problem?

you can check in files changed option also, what changes I made on login and signup.

mayank-del commented 2 years ago

@KaizenGirl1111 mam, have you understood the problem?

you can check in files changed option also, what changes I made on login and signup.

@KaizenGirl1111 maam , try to understand, nime is very less , you can check , I haven't touch the codes of signup and login , I just removed those unwanted non-programming characters which will not let the program to run.

So, please , @KaizenGirl1111 maam , merge it , so that I can finish your rest issues, those are time taking

KaizenGirl1111 commented 2 years ago

@mayank-del hi Mayank I'm trying to merge it but it has few conflicts due to which the pr is not merging even though I want to Are some some lined as you've described in signup and login that can be removed and there won't be any merge conflicts?

mayank-del commented 2 years ago

@KaizenGirl1111 maam sorry for inconvenience , conflicts resolved, now merge it.