jeff/pvpokemon
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

move form below type

Browse Source
This commit is contained in:
Jeff Colombo 2019-02-13 19:58:56 -05:00
parent a3c5e2a25a
commit aaaec295a2
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ts/app/components/PokemonExplorer/PokemonExplorer.tsx
View File

@ -274,13 +274,13 @@ export class PokemonExplorer extends React.Component<IPokemonExplorerProps, ISta
<div className={ styles.pokemonInfoLeftColumn }> <div className={ styles.pokemonInfoLeftColumn }>
<i className={ pokemonIconCss } /> <i className={ pokemonIconCss } />
<h4 className={ styles.dexHeader }>No.{ dex }</h4> <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 }> <div className={ styles.pokemonTypeWrapper }>
{ type1 } { type1 }
{ type2 } { type2 }
</div> </div>
{ leaguePokemon.form !== POGOProtos.Enums.Form.FORM_UNSET &&
<h6 className={ styles.formHeader }>{ formatForm(leaguePokemon.form) } Form</h6>
}
</div> </div>
<div className={ styles.pokemonInfoRightColumn }> <div className={ styles.pokemonInfoRightColumn }>
<h2 className={ styles.pokemonName }>{ leaguePokemon.name }</h2> <h2 className={ styles.pokemonName }>{ leaguePokemon.name }</h2>

3
src/ts/app/components/PokemonExplorer/styles/PokemonExplorer.scss
View File

@ -68,7 +68,7 @@
margin-top: 0.5rem; margin-top: 0.5rem;
font-size: 0.7em; font-size: 0.7em;
flex-basis: 50%; 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 // override the default nes.css default, which uses #fff
@ -97,6 +97,7 @@
.formHeader { .formHeader {
text-transform: uppercase; text-transform: uppercase;
margin-bottom: 0;
} }
.pokemonBaseStats { .pokemonBaseStats {