Skip to content

Commit

Permalink
Merge pull request #12 from ClojureBridge/margin-fixes
Browse files Browse the repository at this point in the history
Fix some margin in header and paypall button
  • Loading branch information
davidchambers authored Sep 28, 2016
2 parents 57948b3 + dd76563 commit 54345d4
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 25 deletions.
48 changes: 25 additions & 23 deletions _includes/header.html
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
<div class="site-header">
<div class="header-content">
<div class="site-header">

<a id="home" href="/">{{ site.title }}</a>
<a id="home" href="/">{{ site.title }}</a>

<ul id="site-nav">
{% for page in site.pages %}
{% if page.title %}
<li>
<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
</li>
{% endif %}
{% endfor %}
<li>
<a class="page-link" href="http://bridgefoundry.org/code-of-conduct/">Code of Conduct</a>
</li>
<li>
<a class="page-link" href="https://github.com/ClojureBridge"><i class="fa fa-github"><span>GitHub</span></i></a>
</li>
<li>
<a class="page-link" href="https://twitter.com/ClojureBridge"><i class="fa fa-twitter"><span>Twitter</span></i></a>
</li>
<li>
<a class="page-link" href="mailto:[email protected]"><i class="fa fa-envelope-o"><span>Email</span></i></a>
</li>
</ul>
<ul id="site-nav">
{% for page in site.pages %}
{% if page.title %}
<li>
<a class="page-link" href="{{ page.url | prepend: site.baseurl }}">{{ page.title }}</a>
</li>
{% endif %}
{% endfor %}
<li>
<a class="page-link" href="http://bridgefoundry.org/code-of-conduct/">Code of Conduct</a>
</li>
<li>
<a class="page-link" href="https://github.com/ClojureBridge"><i class="fa fa-github"><span>GitHub</span></i></a>
</li>
<li>
<a class="page-link" href="https://twitter.com/ClojureBridge"><i class="fa fa-twitter"><span>Twitter</span></i></a>
</li>
<li>
<a class="page-link" href="mailto:[email protected]"><i class="fa fa-envelope-o"><span>Email</span></i></a>
</li>
</ul>

</div>
</div>
26 changes: 24 additions & 2 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,21 @@ body {
font: 16px/1.4 "freight-sans-pro", "Helvetica", "Arial", sans-serif;
}

.content h1 {
font-size: 32px;
font-weight: 100;
margin-bottom: 0.8em;
}

/* TODO: Change to id */
.site-header {
max-width: 62.5em;
margin-left: auto;
margin-right: auto;
width: 100%;
}

.header-content {
border-width: 5px 0 3px;
border-style: solid;
border-color: rgb(51, 52, 62);
Expand Down Expand Up @@ -58,6 +71,7 @@ body {

.content-wrapper {
padding: 0 2em;
margin-top: 1em;
}

.content {
Expand Down Expand Up @@ -136,7 +150,7 @@ img {
border-radius: 6px;
font-size: 13px;
background: #fec348 none repeat scroll 0 0;
border-color: #feb215;
border: 1px solid #feb215;
color: #002f86;
}

Expand All @@ -146,5 +160,13 @@ img {
}

#paypal-button {
float: right;
text-align: left;
margin-bottom: 1.0em;
}

@media screen and (min-width: 640px) {
#paypal-button {
text-align: right;
margin-bottom: -2.0em;
}
}

0 comments on commit 54345d4

Please sign in to comment.