Repository navigation
#42 adding CSS3 wobble animation to battle box on onhover event - #74
Open
federicocastaneda wants to merge 1 commit into
Open
federicocastaneda wants to merge 1 commit into
federicocastaneda wants to merge 1 commit into
Conversation
Contributor
|
@federicocastaneda not sure what happened here but federicocastaneda@e2c50b0 doesn't seem to be in this branch anymore? maybe pulling in the new changes in origin/master to your branch would help? |
kalacommitbot
force-pushed
the
master
branch
2 times, most recently
from
October 22, 2014 04:49
cf700f6 to
33b8eba
Compare
Contributor
|
I like the animation, it's pretty entertaining. Resolving merge conflicts, as Mike outlined above, will help get this in. Thanks! Github outlines fixing merge conflicts below, if you would like assistance getting that in, I'll be available. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
On hover, the battle box becomes animated to clearly indicate the vote you are about to submit