Skip to content

Commit

Permalink
Merge pull request #18 from vinnymac/feature/sprites
Browse files Browse the repository at this point in the history
add sprites to table
  • Loading branch information
duhminick authored Aug 1, 2016
2 parents fe7f144 + ddb92e6 commit 04d8b74
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 0 deletions.
9 changes: 9 additions & 0 deletions css/pokenurse.css
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@ thead > tr > td {

/* Pokemon Detail CSS */

.pokemon-avatar {
width: 80px;
height: 85px;
}

.pokemon-avatar > .pokemon-sprite {
transform: translate3d(-40px, -4px, 0px);
}

#mv_contents {
margin-left: 30px;
margin-right: 10px;
Expand Down
1 change: 1 addition & 0 deletions home.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ <h1>
<span class="favorite glyphicon glyphicon-star favorite-yellow"></span>
</td>
<td data-sort="pokemon_id">Pokédex #</td>
<td data-sort="name">Sprite</td>
<td data-sort="name">Name</td>
<td data-sort="nickname">Nickname</td>
<td data-sort="cp">CP</td>
Expand Down
1 change: 1 addition & 0 deletions js/home.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ function sortPokemonList (sorting, refresh) {
html += '<td>' + checkBox + '></td>'
html += '<td><span class="favorite ' + favorite + '" id="favoriteBtn" data-pokemon-id="' + poke['id'] + '" data-pokemon-favorited="' + favoriteBool + '" /></td>'
html += '<td>' + poke['pokemon_id'] + '</td>'
html += '<td>' + '<div class="pokemon-avatar"><div class="pokemon-sprite ' + poke['name'].toLowerCase() + '"></div></div>' + '</td>'
html += '<td>' + poke['name'] + '</td>'
html += '<td class="nickname" data-toggle="modal" data-target="#bulbasaurModal">' + poke['nickname'] + '</td>'
html += '<td>' + poke['cp'] + '</td>'
Expand Down

0 comments on commit 04d8b74

Please sign in to comment.