diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/images/pokeviewer/ShinyIVStar.png | bin | 0 -> 226 bytes | |||
-rw-r--r-- | app/assets/stylesheets/pokeviewer/pokemon.css.scss | 9 | ||||
-rw-r--r-- | app/views/pokeviewer/pokemon/show.html.haml | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/images/pokeviewer/ShinyIVStar.png b/app/assets/images/pokeviewer/ShinyIVStar.png new file mode 100644 index 0000000..ecd3b58 --- /dev/null +++ b/app/assets/images/pokeviewer/ShinyIVStar.png | |||
Binary files differ | |||
diff --git a/app/assets/stylesheets/pokeviewer/pokemon.css.scss b/app/assets/stylesheets/pokeviewer/pokemon.css.scss index b7f9358..cd919e7 100644 --- a/app/assets/stylesheets/pokeviewer/pokemon.css.scss +++ b/app/assets/stylesheets/pokeviewer/pokemon.css.scss | |||
@@ -191,7 +191,7 @@ | |||
191 | 191 | ||
192 | &.in-emerald { | 192 | &.in-emerald { |
193 | .pokemon-image { | 193 | .pokemon-image { |
194 | img { | 194 | .pokemon-sprite { |
195 | margin: -14px; | 195 | margin: -14px; |
196 | } | 196 | } |
197 | } | 197 | } |
@@ -249,6 +249,13 @@ | |||
249 | border-radius: 10px; | 249 | border-radius: 10px; |
250 | display: inline-block; | 250 | display: inline-block; |
251 | padding: 4px; | 251 | padding: 4px; |
252 | position: relative; | ||
253 | |||
254 | .pkv-shiny-star { | ||
255 | position: absolute; | ||
256 | top: 0; | ||
257 | right: -1.5em; | ||
258 | } | ||
252 | } | 259 | } |
253 | } | 260 | } |
254 | 261 | ||
diff --git a/app/views/pokeviewer/pokemon/show.html.haml b/app/views/pokeviewer/pokemon/show.html.haml index f3568fb..0daabb0 100644 --- a/app/views/pokeviewer/pokemon/show.html.haml +++ b/app/views/pokeviewer/pokemon/show.html.haml | |||
@@ -6,7 +6,10 @@ | |||
6 | %span.pokemon-gender{ class: @pokemon.gender }= @pokemon.gender_symbol | 6 | %span.pokemon-gender{ class: @pokemon.gender }= @pokemon.gender_symbol |
7 | .pokemon-level= "Lv. #{@pokemon.revisions.last.level}" | 7 | .pokemon-level= "Lv. #{@pokemon.revisions.last.level}" |
8 | .pokemon-image | 8 | .pokemon-image |
9 | .pokemon-image-wrap= image_tag @pokemon.sprite_path | 9 | .pokemon-image-wrap |
10 | = image_tag @pokemon.sprite_path, class: "pokemon-sprite" | ||
11 | - if @pokemon.shiny? | ||
12 | = image_tag "pokeviewer/ShinyIVStar.png", class: "pkv-shiny-star" | ||
10 | - if @pokemon.revisions.last.item.nil? | 13 | - if @pokemon.revisions.last.item.nil? |
11 | .pokemon-item-label Item | 14 | .pokemon-item-label Item |
12 | .pokemon-item None | 15 | .pokemon-item None |