Add more colour themes - Githubissues

kblincoe / VisualGit_SE701_2

1 stars 0 forks source link

Add more colour themes #54

Closed chaejj closed 6 years ago

chaejj commented 6 years ago

Added two more colour themes (blue and green) as per issue #19

Added css classes (styles.css)
Added two more elements to the drop down list for colours (authenticate.component.ts)
Modified changeColor method to account for two more colours (color.ts)

Also removed a greek question mark in git.ts

softeng-701 commented 6 years ago

@chaejj Please squash your commits, thanks!

softeng-701 commented 6 years ago

@chaejj The workflow for this assignment has the TA's merging the PRs, please don't merge your own in the future. Also, squash your commits before you submit your PRs. Thanks

chaejj commented 6 years ago

Oops I am sorry. I thought that you guys would merge initially but when i saw the earlier comment (to squash the commits) i thought you meant squash commits when I merge. I thought Kelly told us to keep each commit when doing the pull request so that TAs can go through each commit? And when you told me to squash I thought squash commits when I merge.

Should I revert? I am sorry!! @softeng-701

softeng-701 commented 6 years ago

@chaejj Lets leave it for the moment. Don't stress, this seems like a common mistake atm. Please don't merge yourself in the future though. If you have more than 2 commits please squash them. You should squash commits locally (Rebase)