Skip to content

Added nickname mapping and display on pokemon card #85

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

Open
shinyuX wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added nickname mapping and display on pokemon card #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d3b6f8d
Added nickname mapping and display on pokemon card
Aug 22, 2016
efa899d
[NICKNAME] Bigger size for pokemon-card
Sep 15, 2016
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
9 changes: 8 additions & 1 deletion app/assets/stylesheets/pokemon.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
color: rgba(0,0,0,.46);
}
.pokemon-card {
height: 25rem;
height: 27rem;
position: relative;
table {
width: 100%;
Expand Down Expand Up @@ -63,6 +63,13 @@
font-size: 1.4rem;
}
}
.nickname {
margin-top: 0px;
margin-bottom: 0px;
font-size: 2.0rem;
font-weight: bold;
position: relative;
}
.name {
margin-top: 0px;
margin-bottom: 0px;
Expand Down
1 change: 1 addition & 0 deletions app/models/pokemon.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
class Pokemon < ApplicationRecord
belongs_to :user, dependent: :destroy
validates :poke_id, presence: true
validates :nickname, presence: true
validates :move_1, presence: true
validates :move_2, presence: true
validates :max_health, presence: true
Expand Down
3 changes: 3 additions & 0 deletions app/views/pokemons/_pokemon.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
</div>
<div class="caption data">
<table>
<tr>
<td class="nickname"><%=pokemon[:nickname]%></td>
</tr>
<tr>
<td class="name"><%=pokemon[:poke_id]%></td>
<td class="CP"><%=pokemon[:cp]%></td>
Expand Down