From aaaec295a2d6c43c15666e57dfd3636a1adf6c83 Mon Sep 17 00:00:00 2001
From: Jeff Colombo <jeff@colombo.us>
Date: Wed, 13 Feb 2019 19:58:56 -0500
Subject: [PATCH] move form below type

---
 src/ts/app/components/PokemonExplorer/PokemonExplorer.tsx   | 6 +++---
 .../components/PokemonExplorer/styles/PokemonExplorer.scss  | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ts/app/components/PokemonExplorer/PokemonExplorer.tsx b/src/ts/app/components/PokemonExplorer/PokemonExplorer.tsx
index 7d62444..6f4861b 100644
--- a/src/ts/app/components/PokemonExplorer/PokemonExplorer.tsx
+++ b/src/ts/app/components/PokemonExplorer/PokemonExplorer.tsx
@@ -274,13 +274,13 @@ export class PokemonExplorer extends React.Component<IPokemonExplorerProps, ISta
                         <div className={ styles.pokemonInfoLeftColumn }>
                             <i className={ pokemonIconCss } />
                             <h4 className={ styles.dexHeader }>No.{ dex }</h4>
-                            { leaguePokemon.form !== POGOProtos.Enums.Form.FORM_UNSET &&
-                                <h6 className={ styles.formHeader }>{ formatForm(leaguePokemon.form) } Form</h6>
-                            }
                             <div className={ styles.pokemonTypeWrapper }>
                                 { type1 }
                                 { type2 }
                             </div>
+                            { leaguePokemon.form !== POGOProtos.Enums.Form.FORM_UNSET &&
+                                <h6 className={ styles.formHeader }>{ formatForm(leaguePokemon.form) } Form</h6>
+                            }
                         </div>
                         <div className={ styles.pokemonInfoRightColumn }>
                             <h2 className={ styles.pokemonName }>{ leaguePokemon.name }</h2>
diff --git a/src/ts/app/components/PokemonExplorer/styles/PokemonExplorer.scss b/src/ts/app/components/PokemonExplorer/styles/PokemonExplorer.scss
index c1e72f1..125cbf1 100644
--- a/src/ts/app/components/PokemonExplorer/styles/PokemonExplorer.scss
+++ b/src/ts/app/components/PokemonExplorer/styles/PokemonExplorer.scss
@@ -68,7 +68,7 @@
     margin-top: 0.5rem;
     font-size: 0.7em;
     flex-basis: 50%;
-    margin-bottom: 14px; // reset to default nes.css value
+    margin-bottom: 11px; // default nes.css value is 14px
   }
 
   // override the default nes.css default, which uses #fff
@@ -97,6 +97,7 @@
 
 .formHeader {
   text-transform: uppercase;
+  margin-bottom: 0;
 }
 
 .pokemonBaseStats {