Skip to content

Commit

Permalink
Merge pull request #38 from CadillacJenkins/dev
Browse files Browse the repository at this point in the history
updates to footer - added logos, links, formated chickens
  • Loading branch information
AvidDabbler committed Mar 3, 2019
2 parents 17ced42 + 146b16b commit e4f0412
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 7 deletions.
Binary file added app/images/GitHub-Mark-64px.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/images/openstl-square-logo.jpeg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 14 additions & 4 deletions app/index.html
Expand Up @@ -105,10 +105,20 @@ <H1>About</H1>
</section>

<footer class="end">
<img src="images\chicken1.png" alt="chicken 1" height="168" width="168" />
<img class="chicken2" src="images\chicken2.png" alt="chicken 2" height="168" width="168" />
<img src="images\chicken3.png" alt="chicken 3" height="168" width="168" />
<img src="images\chicken4.png" alt="chicken 4" height="168" width="168" />
<div id=chickens-end>
<img src="images\chicken1.png" alt="chicken 1" height=100%/>
<img class="chicken2" src="images\chicken2.png" alt="chicken 2" height=100%/>
<img src="images\chicken3.png" alt="chicken 3" height=100%/>
<img src="images\chicken4.png" alt="chicken 4" height=100%/>
</div>
<div id=links>
<a href="https://github.com/OpenDataSTL/backyard-chickens/tree/master">
<img src="images\GitHub-Mark-64px.png" alt="backyard-chickens project link" height="80%">
</a>
<a href="https://openstl.org">
<img src="images\openstl-square-logo.jpeg.png" alt="OpenSTL site link" height="80px">
</a>
</div>
</footer>
</body>

Expand Down
31 changes: 28 additions & 3 deletions app/style/main.css
Expand Up @@ -94,9 +94,9 @@ body {
margin-bottom: 25px;
}
.middle p{
font-size: 15px;
font-size: 18px;
text-align: center;
width: 80%;
width: 90%;
margin: 0px auto;
}
.middle h1 {
Expand Down Expand Up @@ -207,7 +207,25 @@ textarea {
bottom: 0;
width: 100%;
margin-top: 11vh;
height: 100px;
height: 150px;
}

#chickens-end {
width: 100%;
height: 90%;
padding: 10px;

}

#links {
display: inline-block;
padding-top: 30px;
padding-bottom: 40px;
}

#links img {
padding-left: 10px;
padding-right: 10px;
}

.chicken2 {
Expand Down Expand Up @@ -241,6 +259,13 @@ textarea {
.top {
justify-items: center;
}
.end {
text-align: center;
bottom: 0;
width: 100%;
margin-top: 11vh;
height: 100px;
}
.end>img {
background-color: var(--blue);
height: 100%;
Expand Down

0 comments on commit e4f0412

Please sign in to comment.