search

zero-to-mastery / Keiko-Corp

HTML challenge for Hacktoberfest 2020
https://keiko-corp.netlify.app/
MIT License
207 stars 371 forks source link

Fixes for Blog.html #937

Closed jenistenxavier closed 4 years ago

jenistenxavier commented 4 years ago

Pull Request Template

Please provide all of the details below. Pull requests missing any of the information below will be closed! Providing the issue number/url helps us identify the problem being solved and keep the issues tab clean and tidy

What issue does this fix?.

Summarize what this PR fixes:- Fixed Dark and light theme backgrounds for the footer section and the subscribe button on Blog.html.

What ISSUE NUMBER does this fix?

Fixes #936 https://github.com/zero-to-mastery/Keiko-Corp/issues/936

Checklist

(Add an x between the brackets to check the items)

zero-to-mastery-bot[bot] commented 4 years ago

🥳 Congratulations 🎉

Congrats on making your first Pull Request in the Zero To Mastery Organization! You have been sent an invitation to join the ZTM github organization, please check your emails for further details!

ZTM Profile Badge

If you'd like the ZTM Badge to show up on your profile, you will need to follow this guide!

zero-to-mastery-bot[bot] commented 4 years ago

🙏 Thanks for your pull request @jenistenxavier, The team will now review and merge this request. In the mean time why not check out some of the other opensource projects available, contributions are greatly appreciated!

Some of the most popular are

PR Statistics

#️⃣ PR Number: ➕ Line Additions: 🗑️ Line Deletions:
937 18 2
📑 Files Changed: ⭐ Repo Stars: 🔱 Total Forks:
3 198 410
brittneypostma commented 4 years ago

There is a conflict in the css and I'm not sure which one you have added. Can you please take a look and correct the conflict?

zero-to-mastery-bot[bot] commented 4 years ago

⚠️ MERGE CONFLICT DETECTED!

@jenistenxavier A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, there are tons of guides on Google and Youtube to help you out. If you get stuck ask over on Discord.

zero-to-mastery-bot[bot] commented 4 years ago

⚠️ MERGE CONFLICT DETECTED!

@jenistenxavier A possible conflict has been detected, you will need to resolve this before your pull request can be merged. The most common reason conflicts occur, is when the contributor does not run git pull origin master before pushing their new changes.

Before we can merge the code, you will need to resolve the conflict, there are tons of guides on Google and Youtube to help you out. If you get stuck ask over on Discord.