search

fossasia / gci14.fossasia.org

FOSSASIA Google Code-In Website 2014/15 http://gci14.fossasia.org
1.57k stars 109 forks source link

Adding Social Buttons #71

Closed udeepak closed 9 years ago

udeepak commented 9 years ago

Adding a Twitter follow button and Facebook like button and removing the black background in the buttons in the slider.

roonyh commented 9 years ago

Thanks! So having the like and follow button fixed when scrolling is not nice. Please place them somewhere appropriate. In the bottom with email subscriptions maybe?

udeepak commented 9 years ago

Parallax effect added.

roonyh commented 9 years ago

Thanks! This can be spruced up to a nice addition to our site. Firstly you are working on old code. This makes it very difficult to merge your code. A lot of conflicts occur. Plus merging this pull request will bring in some previous work of yours that we don't need at the moment. Here's what you can do. Back up your files. (copy them to somewhere else)

Make your local branch identical to the remote master branch. git fetch origin git reset --hard origin/master This will remove all your current work. But you have the backed up files.

More info: http://stackoverflow.com/questions/1628088/how-to-reset-my-local-repository-to-be-just-like-the-remote-repository-head

carefully add only the changes that you require for parallax scrolling from your backed up files. Add only the images and libraries that you require for parallax scrolling. Make the images in the background black and white. And reduce the brightness. This will make the text more readable.

Commit and submit a new pull request.

You can add the change to your own copy of website and give us the link too.