search

pclubuiet / website

Programming club, PU official website.
https://pclubuiet.herokuapp.com
GNU General Public License v3.0
14 stars 70 forks source link

make navbar responsive #92

Closed olaoluwa-98 closed 6 years ago

olaoluwa-98 commented 6 years ago

Make navbar responsive

olaoluwa-98 commented 6 years ago

I have an issue, while trying to squash, there's been some commits from other people. How can I do the squashing without it affecting the other people's commits

divyam3897 commented 6 years ago

you had to a rebase, it places your changes above the changes of others. see https://stackoverflow.com/questions/7297379/how-do-you-rebase-the-current-branchs-changes-on-top-of-changes-being-merged-in

olaoluwa-98 commented 6 years ago

I think I have fixed the issues now

olaoluwa-98 commented 6 years ago

I have made neccessary changes

olaoluwa-98 commented 6 years ago

I reverted to the commit before then, then made the changes. I think this solves it.

olaoluwa-98 commented 6 years ago

I've added the jQuery dependency that bootstrap js needs

divyam3897 commented 6 years ago

It has been merged, thank you :)