Skip to content

Commit

Permalink
Update site to satisfy Whimsy site check (#157)
Browse files Browse the repository at this point in the history
To satisfy https://whimsy.apache.org/site/project/fluo

* Add Events link to menu and image to body of page
* Fix trademarks footer
* Fix license link
  • Loading branch information
ctubbsii authored Apr 11, 2018
1 parent 8590b7a commit 5892caf
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 14 deletions.
31 changes: 23 additions & 8 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,12 @@
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Apache Software Foundation<span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="https://www.apache.org">Apache Homepage</a></li>
<li><a href="https://www.apache.org/licenses/LICENSE-2.0">License</a></li>
<li><a href="https://www.apache.org/licenses/">License</a></li>
<li><a href="https://www.apache.org/foundation/sponsorship">Sponsorship</i></a></li>
<li><a href="https://www.apache.org/security">Security</a></li>
<li><a href="https://www.apache.org/foundation/thanks">Thanks</a></li>
<li><a href="https://www.apache.org/foundation/policies/conduct">Code of Conduct</a></li>
<li><a href="https://www.apache.org/events/current-event.html">Current Event</a></li>
</ul>
</li>
</ul>
Expand All @@ -82,13 +83,27 @@
{{ content }}
</div>
</div>
<hr>
<div class="row footer">
<div class="col-sm-12 text-center">
<div class="center-block">
<a href="https://apache.org"><img src="{{ site.baseurl }}/resources/feather.png" alt="Apache"></a>
Copyright &copy; {{ site.time | date: '%Y' }} The Apache Software Foundation. Licensed under the <a href="https://www.apache.org/licenses/LICENSE-2.0">Apache&nbsp;License,&nbsp;Version&nbsp;2.0</a>
</div>
<div class="row">
<div class="col-sm-12 center-block">
<footer>
<hr/>
<p>
<a href="https://www.apache.org/foundation/contributing"><img
src="https://www.apache.org/images/SupportApache-small.png"
id="asf-logo" height="100" alt="Apache"/></a>
</p>
<p>
Copyright &copy; {{ site.time | date: '%Y' }} <a
href="https://www.apache.org">The&nbsp;Apache&nbsp;Software&nbsp;Foundation</a>.
Licensed under the <a
href="https://www.apache.org/licenses/">Apache&nbsp;License,&nbsp;Version&nbsp;2.0</a>
</p>
<p>
Apache®, the names of Apache projects and their logos, and the multicolor feather
logo are registered trademarks or trademarks of The Apache Software Foundation
in the United States and/or other countries.
</p>
</footer>
</div>
</div>
</div>
Expand Down
30 changes: 24 additions & 6 deletions css/fluo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ th, td {
border-bottom: 1px solid #ddd;
}

p {
p {
line-height: 25px;
padding-top: 5px;
font-size: 16px;
}

li {
li {
line-height: 25px;
}

Expand Down Expand Up @@ -47,10 +47,28 @@ tr:nth-child(odd) {background: #FFF}
}
}

.footer {
margin: 10px 0 30px;
font-size: 12px;
footer {
margin: 10px 0 30px;
color: #aaa;
padding: 8px 8px;
text-align: center;
vertical-align: middle;
}

footer > hr {
width: 80%;
}

footer > p {
line-height: 1.5em;
padding-top: 1em;
font-size: 12px;
width: 60%;
margin: auto;
}

#asf-logo {
float: left;
}

// index.html
Expand Down Expand Up @@ -79,7 +97,7 @@ tr:nth-child(odd) {background: #FFF}
margin-bottom: 20px;
}

// page
// page
#page-content {
margin-top: 20px;
}
Expand Down
5 changes: 5 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ <h3 id="news-header">Latest News</h3>
</div>
</div>
</div>
<div class="row">
<div class="col-sm-12">
<a id="asf-current-event-logo" href="https://www.apache.org/events/current-event.html"><img alt="ASF Current Events" class="img-responsive center-block" src="https://www.apache.org/events/current-event-234x60.png"/></a>
</div>
</div>
</div>
</div>

Expand Down

0 comments on commit 5892caf

Please sign in to comment.