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

Added favicon and some additional files #10

Merged
merged 1 commit into from
Dec 5, 2018
Merged

Added favicon and some additional files #10

merged 1 commit into from
Dec 5, 2018

Conversation

harry-hov
Copy link
Contributor

What Changes i did ?

1, Added favicon

favicon

Need : Its a small change but makes site more attractive. (as i'm working on its makeover)

2. Changed location of main.css and added some new files

Changes are in StudentPortal> pro1> blog> static
files changed

Need : These files are required to makeover and redesign some html pages. (may be unfinished, but does not affect working of project).
Why I'm pushing this now? so everyone will get new location of main.css

3. Typo error

in settings.py, line no. 131
bootstrp4 -> bootstrap4
Need : because without this fix project is not working on localhost. So in order run it on localhost i fix this.

@monsij
Copy link
Member

monsij commented Dec 4, 2018

Hope that you have followed the contribution guidelines :-)

(Powered by GitMate.io)

@harry-hov
Copy link
Contributor Author

PR regarding #2

@harry-hov
Copy link
Contributor Author

harry-hov commented Dec 4, 2018

All Submissions:

  • Have you followed the guidelines in our Contributing document?
    Yes, I did

New Feature Submissions:

  1. Does your submission pass build tests locally?
    Yes
  2. Have you indented your code locally prior to submission?
    Yes

Changes to Core Features:

  • Have you added an explanation of what your changes do and why you'd like us to include them?
    Yes
  • Have you successfully ran tests with your changes locally?
    Yes, it ran without any issue.

@monsij
Copy link
Member

monsij commented Dec 4, 2018

The local host is working fine right @harry-hov ?

@monsij
Copy link
Member

monsij commented Dec 4, 2018

With some more screenshots of the new layout , this PR will be ready to get merged✌

@harry-hov
Copy link
Contributor Author

yeah, i checked
it is working fine

@monsij
Copy link
Member

monsij commented Dec 4, 2018

@harry-hov. Squash all your commits into one.Give it a suitable message in an imperative mood.

@monsij monsij self-requested a review December 4, 2018 21:46
@harry-hov
Copy link
Contributor Author

new layout is still in progress, thats why i didnt pushed it in this PR

With some more screenshots of the new layout , this PR will be ready to get merged✌

here it is
new_lay

@monsij
Copy link
Member

monsij commented Dec 4, 2018

Ok fine. Just squash up your commits

@harry-hov
Copy link
Contributor Author

@harry-hov. Squash all your commits into one.Give it a suitable message in an imperative mood.

it means making patch ?

@monsij
Copy link
Member

monsij commented Dec 4, 2018

Look here

@harry-hov
Copy link
Contributor Author

its my first encounter with rebase. what to do after opening rebase editor. type a new commit msg ? @monsij

@monsij
Copy link
Member

monsij commented Dec 4, 2018

Yes.after you have all your changes under 1 commit, give it a short title

@harry-hov
Copy link
Contributor Author

and after giving short title, send PR again?

@monsij
Copy link
Member

monsij commented Dec 4, 2018

This same PR

@harry-hov
Copy link
Contributor Author

so its done @monsij ?
i did it right?

Copy link
Contributor

@gopavasanth gopavasanth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess Change of Bootstrap (Typo) already fixed, Did you try rebasing your repo?

@monsij
Copy link
Member

monsij commented Dec 5, 2018

@harry-hov : henceforth make PR from a branch of your fork . This time its fine. 😁

@monsij
Copy link
Member

monsij commented Dec 5, 2018

ack 514ac79

@monsij
Copy link
Member

monsij commented Dec 5, 2018

"@gitmate-bot rebase"

@monsij
Copy link
Member

monsij commented Dec 5, 2018

Hey! I'm GitMate.io! This pull request is being rebased automatically. Please DO NOT push while rebase is in progress or your changes would be lost permanently ⚠️

@monsij
Copy link
Member

monsij commented Dec 5, 2018

Automated rebase with GitMate.io was successful! 🎉

@monsij
Copy link
Member

monsij commented Dec 5, 2018

ack 514ac79

@monsij monsij merged commit b6103e8 into NIT-DGPortal:master Dec 5, 2018
@monsij monsij mentioned this pull request Dec 5, 2018
@harry-hov
Copy link
Contributor Author

learned a lot from this like about rebase and squash.
Thank you @monsij

@monsij monsij mentioned this pull request Dec 5, 2018
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants