Open federicocastaneda opened 9 years ago
@federicocastaneda not sure what happened here but https://github.com/federicocastaneda/playbox/commit/e2c50b042fc6b623a812e92fe5fc549cfde8dd79 doesn't seem to be in this branch anymore? maybe pulling in the new changes in origin/master to your branch would help?
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.
On hover, the battle box becomes animated to clearly indicate the vote you are about to submit