diff --git a/app/assets/stylesheets/pokemon.scss b/app/assets/stylesheets/pokemon.scss index 3f2bca8..84ae6df 100644 --- a/app/assets/stylesheets/pokemon.scss +++ b/app/assets/stylesheets/pokemon.scss @@ -10,7 +10,7 @@ color: rgba(0,0,0,.46); } .pokemon-card { - height: 25rem; + height: 27rem; position: relative; table { width: 100%; @@ -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; diff --git a/app/models/pokemon.rb b/app/models/pokemon.rb index a90ddfc..0c390b8 100644 --- a/app/models/pokemon.rb +++ b/app/models/pokemon.rb @@ -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 diff --git a/app/views/pokemons/_pokemon.html.erb b/app/views/pokemons/_pokemon.html.erb index 81eb96a..144c38e 100644 --- a/app/views/pokemons/_pokemon.html.erb +++ b/app/views/pokemons/_pokemon.html.erb @@ -22,6 +22,9 @@
+ + +
<%=pokemon[:nickname]%>
<%=pokemon[:poke_id]%> <%=pokemon[:cp]%>