Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed some CSS errors mostly #87

Merged
merged 1 commit into from
Jul 21, 2017
Merged

Fixed some CSS errors mostly #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions public/index.html
View file
Open in desktop
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
View file
Open in desktop
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