Merge pull request #363 from WatWowMap/minor-pokemon-popup-fixes

Minor Popup Adjustments
WatWowMap · Apr 15, 2021 · 5a4e237 · 5a4e237
2 parents 701fb47 + 3c098f4
commit 5a4e237
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/static/css/popups.css b/static/css/popups.css
@@ -66,7 +66,7 @@
 }
 
 .pokemon-despawn-timers {
-  grid-column: 1;
+  grid-column: 2;
   grid-row: 5;
   margin: auto;
   padding: 5px;
@@ -89,7 +89,7 @@
 }
 
 .pokemon-other-timers {
-  grid-column: 2;
+  grid-column: 1;
   grid-row: 5;
   margin: auto;
   padding: 5px;

diff --git a/static/js/index.js b/static/js/index.js
@@ -3077,7 +3077,7 @@ const getPokemonPopupContent = (pokemon) => {
   }
 
   const getIV = (pokemon) => {
-    if (pokemon.atk_iv !== null && popupDetails.pokemon.iv) {
+    if (pokemon.atk_iv !== null && pokemon.atk_iv !== undefined && popupDetails.pokemon.iv) {
       const ivColors = { 0: 'red', 66: 'orange', 82: 'yellow', 100: 'green' }
       const ivPercent = ((pokemon.atk_iv + pokemon.def_iv + pokemon.sta_iv) / .45).toFixed(2);
       let selectedColor