From 664837916d382047921eefbcf72a802c23cc7a6d Mon Sep 17 00:00:00 2001 From: Emil Date: Sat, 13 Aug 2016 11:41:24 +0200 Subject: [PATCH 1/2] Added movesets to pokemon cards Added so movesets are shown in the pokemon cards, aswell as links to http://pokemongo.gamepress.gg which shows recommended moveset combo (among other interesting info) for that pokemon type. --- app/views/pokemons/_pokemon.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) %> From 6113d3ec8516fd29e040126348fc05904b548a03 Mon Sep 17 00:00:00 2001 From: Emil Date: Sat, 13 Aug 2016 11:44:31 +0200 Subject: [PATCH 2/2] Added classes for the movesets Added classes for the primary and secondary movesets shown in the pokemon cards page. --- app/assets/stylesheets/pokemon.scss | 10 ++++++++++ 1 file changed, 10 insertions(+) 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%;
<%=pokemon[:battles_attacked]%>