search

seanyo / Hello-I-Tweet-As

Name Tags are Back...in Twitter Form! Twitter's the New Name Tag!
itweet.as
2 stars 2 forks source link

CSS tweaks #19

Closed phildowney closed 13 years ago

phildowney commented 13 years ago

Hey Sean, made those tweaks I showed you on twitter, and added a few more to improve readability. Let me know what you think. As a side note, this is the first time I've used Git/GitHub, so I had to commit back the original file for html/styles/main.css because I couldn't figure out how to roll back. Sorry if the commits look a tad strange because of that.

ccharles commented 13 years ago

Hey Phil!

You're right, these commits are a bit messy. It's not easy to see exactly what has changed, and there are two commits representing one logical change. For this reason we're not going to accept the pull request.

Having said that, we really appreciate your input, and I'll be manually reviewing these changes outside of the pull request. If we decide to incorporate any of them I'll be sure to credit you in the commit message. We definitely need to work on the styling and content of the three input steps.

Finally, I'll be doing a session on Git and GitHub at the next HackGuelph meeting on July 7. Feel free to come to that if you're interested. Most of it it will be introductory stuff, but depending on the interest and questions we could also get pretty detailed.

~Chris

phildowney commented 13 years ago

Thanks, I'll see if my calendar is clear for that night. Not entirely sure why the diff shows that I deleted everything.. then added everything back. But oh well, I'll try and figure that out later.

ccharles commented 13 years ago

It could be that you (or your editor) changed the end-of-line terminators. Are you on Windows? The original file used Unix/Linux line terminators.

There are ways of dealing with that in your editor, and also (I'm pretty sure) in Git itself.

Edit:

It looks like this is exactly what happened. Running git diff -w HEAD~2 HEAD shows the differences ignoring whitespace-only changes. (I highly recommend enabling coloured diff output with git config --global color.diff true.)

phildowney commented 13 years ago

I reinstalled Git and picked the Unix line ending options, and did a simple test - looks like it works now. Now if only I knew how to blow away commits and try again @_@.

ccharles commented 13 years ago

You can do it, but it's a really good idea not to modify history on stuff that you've pushed or that somebody else has pulled from. In this case I'd recommend deleting your fork in GitHub, reforking, and starting again.

If you don't feel like doing that I can work with what I've got. It's not hard, but I'll need a few minutes to test the changes :-).

History modification is a really powerful feature of Git, but like most powerful features it shouldn't be misused.

phildowney commented 13 years ago

No, I'd much rather learn how to do this stuff. I'll re-fork and try again!

On Fri, Jun 17, 2011 at 10:18 AM, ccharles < reply@reply.github.com>wrote:

You can do it, but it's a really good idea not to modify history on stuff that you've pushed or that somebody else has pulled from. In this case I'd recommend deleting your fork in GitHub, reforking, and starting again.

If you don't feel like doing that I can work with what I've got. It's not hard, but I'll need a few minutes to test the changes :-).

History modification is a really powerful feature of Git, but like most powerful features it shouldn't be misused.

Reply to this email directly or view it on GitHub: https://github.com/seanyo/Hello-I-Tweet-As/pull/19#issuecomment-1388420

phildowney commented 13 years ago

Also, are you ChrisUnfiltered on twitter, by chance?

On Fri, Jun 17, 2011 at 10:20 AM, Phil Downey downey.phil@gmail.com wrote:

No, I'd much rather learn how to do this stuff. I'll re-fork and try again!

On Fri, Jun 17, 2011 at 10:18 AM, ccharles < reply@reply.github.com>wrote:

You can do it, but it's a really good idea not to modify history on stuff that you've pushed or that somebody else has pulled from. In this case I'd recommend deleting your fork in GitHub, reforking, and starting again.

If you don't feel like doing that I can work with what I've got. It's not hard, but I'll need a few minutes to test the changes :-).

History modification is a really powerful feature of Git, but like most powerful features it shouldn't be misused.

Reply to this email directly or view it on GitHub: https://github.com/seanyo/Hello-I-Tweet-As/pull/19#issuecomment-1388420

ccharles commented 13 years ago

Good luck! Let me know if you run into anything.

And, yes, I'm @ChrisUnfiltered.