Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pet Egg Sprite Sheet and CSS #660

Merged
merged 4 commits into from Mar 15, 2013
Merged

Pet Egg Sprite Sheet and CSS #660

merged 4 commits into from Mar 15, 2013

Conversation

Shaners
Copy link
Contributor

@Shaners Shaners commented Mar 15, 2013

This will eventually be merged with the pet sprite sheet and CSS but here is a version that can be worked with. The CSS is a bit different than the other ones used for sprites: use id="PetEggs" to call and class="" to get a specific egg. Not very well versed with CSS and structure of Habit so let me know if this just doesn't work.

@Shaners
Copy link
Contributor Author

Shaners commented Mar 15, 2013

Is there a way to get rid of these unrelated commits?

@switz
Copy link
Contributor

switz commented Mar 15, 2013

Why are you using an id? That should be a class.

Sent from my phone

On Mar 15, 2013, at 1:19 AM, Shane Lister notifications@github.com wrote:

This will eventually be merged with the pet sprite sheet and CSS but here is a version that can be worked with. The CSS is a bit different than the other ones used for sprites: use id="PetEggs" to call and class="" to get a specific egg. Not very well versed with CSS and structure of Habit so let me know if this just doesn't work.

You can merge this Pull Request by running

git pull https://github.com/Shaners/habitrpg master
Or view, comment on, or merge it at:

#660

Commit Summary

Merge pull request #1 from lefnire/master
Merge pull request #2 from lefnire/master
Merge pull request #3 from lefnire/master
Pet Egg Sprite Sheet and CSS
File Changes

A public/img/sprites/Egg_Sprite_Sheet.png (0)
A public/img/sprites/PetEggs.css (17)
Patch Links:

https://github.com/lefnire/habitrpg/pull/660.patch
https://github.com/lefnire/habitrpg/pull/660.diff

@lefnire
Copy link
Contributor

lefnire commented Mar 15, 2013

@Shaners don't worry about the unrelated commits, that's fine. Next commit let's do the PR against develop branch instead of master, and use classes instead of ids. @switz aint no thang, we'll change that.

This is great! Thanks a ton, absolutely love your work sir!

lefnire added a commit that referenced this pull request Mar 15, 2013
Pet Egg Sprite Sheet and CSS
@lefnire lefnire merged commit 1e5ec6f into HabitRPG:master Mar 15, 2013
@lefnire
Copy link
Contributor

lefnire commented Mar 15, 2013

(note: merged into master because this is benign/additive commit, we'll be very strict on develop for code-related commits)

@switz
Copy link
Contributor

switz commented Mar 15, 2013

What do you want me to merge into inventory? Is master fine? Usually I only merge in develop.

On Friday, March 15, 2013 at 10:40 AM, Tyler Renelle wrote:

(note: merged into master because this is benign/additive commit, we'll be very strict on develop for code-related commits)


Reply to this email directly or view it on GitHub (#660 (comment)).

@lefnire
Copy link
Contributor

lefnire commented Mar 15, 2013

master gets merged into develop, so 2 birds 1 stone if you merge in develop
(i merged this commit to develop)

On Friday, March 15, 2013, Daniel Saewitz wrote:

What do you want me to merge into inventory? Is master fine? Usually I
only merge in develop.

On Friday, March 15, 2013 at 10:40 AM, Tyler Renelle wrote:

(note: merged into master because this is benign/additive commit, we'll
be very strict on develop for code-related commits)


Reply to this email directly or view it on GitHub (
#660 (comment)).


Reply to this email directly or view it on GitHubhttps://github.com//pull/660#issuecomment-14970411
.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants