diff --git a/app/assets/stylesheets/pokemon.scss b/app/assets/stylesheets/pokemon.scss index 3f2bca8..b985e92 100644 --- a/app/assets/stylesheets/pokemon.scss +++ b/app/assets/stylesheets/pokemon.scss @@ -39,6 +39,16 @@ right: 7px; top: 5px; } + .moveset_primary{ + @include metadata; + right: 7px; + top: 3.4rem; + } + .moveset_secondary{ + @include metadata; + right: 7px; + top: 4.8rem; + } .attacked{ @include metadata; width: 10%; diff --git a/app/views/pokemons/_pokemon.html.erb b/app/views/pokemons/_pokemon.html.erb index f542640..d27316c 100644 --- a/app/views/pokemons/_pokemon.html.erb +++ b/app/views/pokemons/_pokemon.html.erb @@ -1,10 +1,12 @@
- #<%=pokemon[:poke_num]%> + #<%=pokemon[:poke_num]%> <%=pokemon[:weight_kg].round(2)%>kg <%=pokemon[:height_m].round(2)%>m + <%= format_move(pokemon.move_1) %> + <%= format_move(pokemon.move_2) %>
<%=pokemon[:battles_attacked]%>