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.

Sign up for GitHub

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

new avatar items #2401

Merged
merged 15 commits into from
Oct 14, 2018
Merged

new avatar items #2401

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
77bbd42
lighted jack o lanter on avatar builder
owocki Oct 9, 2018
d521a0f
adds an eth-trek logo to the avatar builder
owocki Oct 9, 2018
c45d086
parrot
owocki Oct 10, 2018
c930115
adds a parrot
owocki Oct 10, 2018
dc1772d
adds cloak
owocki Oct 10, 2018
b5982d3
robe
owocki Oct 10, 2018
1337a22
jack o lantern
owocki Oct 10, 2018
0b984a3
svg: compress + eslint: fix
thelostone-mc Oct 11, 2018
f74e6ab
adds gitcoin bot
owocki Oct 11, 2018
8a36d9f
Merge branch 'kevin/eth-logo' of github.com:gitcoinco/web into kevin/…
owocki Oct 11, 2018
14d6707
code review for avatar extras
owocki Oct 13, 2018
a7bc1b9
herpity derpity
owocki Oct 13, 2018
9c3c799
merge conflictx
owocki Oct 14, 2018
e586c3b
lint-ey lint-ey
owocki Oct 14, 2018
2217e6c
parrot fix?
owocki Oct 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 80 additions & 0 deletions app/assets/v2/images/avatar/Accessories/Extras-Parrot.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions app/assets/v2/images/avatar/Clothing/ethlogo-4242F4.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions app/assets/v2/images/avatar/Clothing/ethlogo-43B9F9.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions app/assets/v2/images/avatar/Clothing/ethlogo-684A23.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions app/assets/v2/images/avatar/Clothing/ethlogo-CCCCCC.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions app/assets/v2/images/avatar/Clothing/ethlogo-F48914.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions app/assets/v2/images/avatar/Clothing/ethlogo-FFCC3B.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/assets/v2/js/avatar_builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ let openSection;
const layers = [
'HatLong', 'HairLong', 'EarringBack', 'Clothing',
'Ears', 'Head', 'HairShort', 'Earring', 'Beard', 'HatShort',
'Mustache', 'Mouth', 'Nose', 'Eyes', 'Glasses', 'Masks'
'Mustache', 'Mouth', 'Nose', 'Eyes', 'Glasses', 'Masks', 'Extras'
];
const requiredLayers = [ 'Clothing', 'Ears', 'Head', 'Mouth', 'Nose', 'Eyes', 'Background' ];
const colorOptions = {
Expand All @@ -29,7 +29,7 @@ const sectionPalettes = {
const parentLayers = {
HairShort: 'HairStyle', HairLong: 'HairStyle', Beard: 'FacialHair', Mustache: 'FacialHair',
EarringBack: 'Accessories', Earring: 'Accessories', HatLong: 'Accessories', HatShort: 'Accessories',
Glasses: 'Accessories', Masks: 'Accessories'
Glasses: 'Accessories', Masks: 'Accessories', Extras: 'Accessories'
};

var localStorage;
Expand Down
4 changes: 2 additions & 2 deletions app/avatar/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def get_avatar_context():
{
'name': 'Clothing',
'title': 'Pick your clothing',
'options': ('cardigan', 'hoodie', 'knitsweater', 'plaid', 'shirt', 'shirtsweater', 'spacecadet')
'options': ('cardigan', 'hoodie', 'knitsweater', 'plaid', 'shirt', 'shirtsweater', 'spacecadet', 'ethlogo')
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

E501 line too long (123 > 120 characters)

},
{
'name': 'Hair Style',
Expand All @@ -93,7 +93,7 @@ def get_avatar_context():
'options': (['Glasses-0'], ['Glasses-1'], ['Glasses-2'], ['Glasses-3'], ['Glasses-4'],
['HatShort-backwardscap'], ['HatShort-ballcap'], ['HatShort-headphones'],
['HatShort-shortbeanie'], ['HatShort-tallbeanie'], ['Earring-0'], ['Earring-1'],
['EarringBack-2', 'Earring-2'], ['Earring-3'], ['Earring-4'], ['Masks-jack-o-lantern'])
['EarringBack-2', 'Earring-2'], ['Earring-3'], ['Earring-4'], ['Masks-jack-o-lantern'], ['Extras-Parrot'])
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

E501 line too long (134 > 120 characters)

},
{
'name': 'Background',
Expand Down