added navbar. related css. made minor text edit to resetpw page. linked login page to resetpw page.

CodingForProduct / tap_rewards

Coding-for-Product Mentorship Project - Demo Transit System Reward App

MIT License

3 stars 2 forks source link

added navbar. related css. made minor text edit to resetpw page. linked login page to resetpw page. #60

Closed carolinambravo closed 7 years ago

carolinambravo commented 7 years ago

Please review. Also, I hope I am now doing the merging in Git correctly. I have made my changes on a separate branch, made commit to development branch, and now requesting merge to master with this pull request.

tinuola commented 7 years ago

Hi @carolinambravo , This pull request should have been for the development branch, but it seems you already merged into it?

carolinambravo commented 7 years ago

Thanks @tinuola. Sorry that I merged directly, I did not mean to but now I'm not sure how to do this without creating the new branch like I was before we met last week. When I created the pull request it did say that there were no conflicts and that it was okay to merge automatically but I thought by doing the pull request it would prevent this. I'm going to be working on the Welcome page tonight so will try to add these correctly this time!