search

BrockCSC / brockcsc.github.io-old

http://brockcsc.ca
3 stars 1 forks source link

Minor site updates by me #10

Closed JamesEarle closed 8 years ago

JamesEarle commented 8 years ago

So far I've added rounded user portraits, some quicker animations, and just edited a small amount of text. I'll continue to push into this branch until I've made enough that we can put on to the master.

Chippers255 commented 8 years ago

This has a merge conflict, I think you worked off of the pre-Peter version. I can't attend to it at the moment, but will be able to later this afternoon. You should be able to manage it yourself should you need to it looks like you have access.

Peter-Wilson commented 8 years ago

yeah, sorry bud. It's gotta be around where you made the changes to the executives. I moved them all around and stuff.

JamesEarle commented 8 years ago

We can just trash this pull request and I'll make the same changes again to an up to date branch, I only made minor modifications and was really just trying to test and verify i can contribute. No problems :+1: