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

makes a 3d avatar builder available along side the classic avatar builder #5257

Merged
merged 43 commits into from
Oct 3, 2019
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
033b808
new kudos request form
owocki Nov 24, 2018
c286d13
make fix
owocki Nov 24, 2018
38568c3
migrations
owocki Nov 24, 2018
3c83cba
Merge branch 'master' into kevin/new_kudos_form
owocki Nov 29, 2018
5ef46b6
docs
owocki Nov 29, 2018
6865ed4
code reivewg
owocki Nov 29, 2018
fa6750d
alt avatr builder
owocki Sep 24, 2019
960788a
make fix
owocki Sep 25, 2019
15a421d
avatar builder
owocki Sep 25, 2019
51c07ea
make fix; stubs out save function
owocki Sep 25, 2019
2a5b775
new avatar builder
owocki Sep 25, 2019
46a9dcf
make fix
owocki Sep 25, 2019
faa9369
avatar udpate
owocki Sep 25, 2019
3d80fa0
Merge branch 'master' into kevin/new_kudos_form
owocki Sep 26, 2019
0cc880e
s3 uploader
owocki Sep 26, 2019
3fcaccc
make fix
owocki Sep 26, 2019
c6fb06d
small fixes
owocki Sep 26, 2019
b492b3d
migratoin
owocki Sep 26, 2019
5bfcd4d
female items in avatar biuldedr
owocki Sep 28, 2019
923d985
remove add tips to eth_sum due to bug
danlipert Oct 2, 2019
de7e8a8
new kudii
owocki Oct 2, 2019
4187ed6
code review
owocki Oct 2, 2019
5b9f097
Merge branch 'kevin/new_kudos_form' into stable
owocki Oct 2, 2019
4fb6a42
referrals MVP
owocki Oct 2, 2019
c6b2a25
merge migration
owocki Oct 2, 2019
b8dc711
errant char
owocki Oct 2, 2019
c01d072
https://gitcoincore.slack.com/archives/CAW05FUD7/p1570041428065600
owocki Oct 2, 2019
5d36bf0
road to devcon kudos
owocki Oct 2, 2019
ceb2c80
format
owocki Oct 2, 2019
79fb4e2
format
owocki Oct 2, 2019
495fc8e
fix loading kudos gif
octavioamu Oct 2, 2019
aa58fc4
fixes for responsive referrals
owocki Oct 2, 2019
4b6879d
Merge branch 'stable' of github.com:gitcoinco/web into stable
owocki Oct 2, 2019
6de9477
closes CLR round 3
owocki Oct 3, 2019
9b2bd59
card img
owocki Oct 3, 2019
19c9b77
dont bork the game for a midi
owocki Oct 3, 2019
718e6df
responsive fixes for quests page + adds backend enforcement of timer
owocki Oct 3, 2019
295c580
new enemies for launch
owocki Oct 3, 2019
225e1f3
unfurl desc for social campaigns
owocki Oct 3, 2019
a526801
wrong date was wrong
owocki Oct 3, 2019
21f7212
limit leaderboard size
owocki Oct 3, 2019
84fe672
Merge branch 'stable' into kevin/alt_avatar
owocki Oct 3, 2019
faec95e
fixes 3d avatar builder
owocki Oct 3, 2019
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
54 changes: 54 additions & 0 deletions app/assets/v2/css/avatar.css
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,57 @@
display:flex;
justify-content: flex-end;
}
#tdavatartarget{
width: 400px;
height: 400px;
margin: 0px auto;
padding-left: 40px;
}
.tdselection{
height: 100px;
width: 100px;
vertical-align: none;
background-color: #eee;
border-radius: 5px;
margin: 10px;
cursor: pointer;
}
.tdselection:hover{
background-color: #bbb;
}
.tdselection.selected{
background-color: #aaa;
}
.select_avatar_type{
color: #9a9a9a;
padding: 5px;
border-bottom: 1px solid #9a9a9a;
margin: 0px auto;
}
.select_avatar_type.frame{
display: none;
}
.select_avatar_type:hover{
color: #9a9a9a;
font-weight: bold;
border-bottom: 2px solid #9a9a9a;
text-decoration: none;
}
.select_avatar_type.active{
color: #0D0764;
border-bottom: 1px solid #0D0764;
}
.tones{
list-style: none;
margin: 5px;
}
.tones li{
display: inline-block;
width: 30px;
height: 30px;
cursor: pointer
}

.tones li.selected{
border: 3px solid #aaa;
}
2 changes: 0 additions & 2 deletions app/assets/v2/css/profile.css
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,6 @@
.float_avatar_image img {
height: 186px;
width: 186px;
border: 3px solid #FFFFFF;
box-shadow: 0 -2px 4px 0 rgba(0,0,0,0.50);
}

.avatar_edit {
Expand Down
6 changes: 6 additions & 0 deletions app/assets/v2/images/avatar/avatar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading