Skip to content

Commit

Permalink
Fixed some CSS errors mostly
Browse files Browse the repository at this point in the history
  • Loading branch information
RogeredBacon committed Jul 21, 2017
1 parent 9617d9a commit af350c5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 1 addition & 3 deletions public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@ <h2> Search for your Pokemon!</h2>
</button>
</form>
<img class = "ho-oh" alt="Legendary Pokemon Ho-Oh enjoying a relaxing summer jaunt." src="http://pokestadium.com/sprites/xy/ho-oh.gif">
<div class ="ashAndDex">

<div id="js-pokeImage">
</div>
<img class="ash" alt="Ash with pokeball" src="http://satoshipedia.altervista.org/wp-content/uploads/2015/12/ash_ketchum-467.png">

</div>


</body>

</html>
3 changes: 3 additions & 0 deletions public/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ button{
}

.ash{
flex: 1;
float: left;
flex-wrap: nowrap;
transform: scale(1.25, 1.25);
Expand All @@ -57,11 +58,13 @@ width: 25%;
}
.pokeImage{
flex-wrap: nowrap;
flex: 3;
height:400px;
margin-left: 206px;
margin-top: 200px;
width:30%;
height: 30%;
z-index: 5;
}

@keyframes bob {
Expand Down

0 comments on commit af350c5

Please sign in to comment.