Skip to content

Commit

Permalink
The pokemon should adjust size and stay in line a little better, but …
Browse files Browse the repository at this point in the history
…Its still not ideal

#72
  • Loading branch information
RogeredBacon committed Jul 21, 2017
1 parent 563a9ae commit e367b44
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<body>

<!-- <audio controls autoplay loop><source src='../media/01.-pokemon-theme.mp3' type='audio/mpeg'> Your Browsers' crap</audio> -->
<!-- <audio controls autoplay loop><source src='../media/01.-pokemon-theme.mp3' type='audio/mpeg'> Your Browser's crap</audio> -->
<form id='js-pokeForm'>
<h2> Search for your Pokemon!</h2>
<label>Search for your Pokemon!
Expand Down
11 changes: 5 additions & 6 deletions public/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -34,35 +34,34 @@ button{

.img{
display: flex;
flex-wrap: nowrap;
box-sizing: border-box;
background-repeat: no-repeat;
}

.ash{
float: left;
flex-wrap: nowrap;
transform: scale(1.25, 1.25);
z-index: -1;
margin-top: 120px;
margin-left: 25px;
width: 25%;
}

.ashAndDex{
display: flex;
justify-content: space-around;
margin-top: 75px;
}

.ho-oh{
z-index: -2;
float: right;
position: relative !important;
animation: bob 10s infinite linear, fly 10s infinite linear, bigger 10s infinite linear;
}
.pokeImage{
flex-wrap: nowrap;
height:400px;
margin-left: 206px;
margin-top: 200px;
width:30%;
height: 30%;
}

@keyframes bob {
Expand Down

0 comments on commit e367b44

Please sign in to comment.