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

Jump to bottom

Fix some margin in header and paypall button #12

Merged
merged 5 commits into from
Sep 28, 2016
Merged

Fix some margin in header and paypall button #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6c0ea9d
Fix some marhin in header and paypall button
Malwine Sep 12, 2016
6fce42a
Fix button on chrome and adjust headlines
Malwine Sep 27, 2016
40a99f6
Button left on mobile
Malwine Sep 27, 2016
179c0d1
Solve conflict
Malwine Sep 27, 2016
dd76563
Show button border
Malwine Sep 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 25 additions & 23 deletions _includes/header.html
View file
Open in desktop
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:info@clojurebridge.org"><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:info@clojurebridge.org"><i class="fa fa-envelope-o"><span>Email</span></i></a>
</li>
</ul>

</div>
</div>
26 changes: 24 additions & 2 deletions css/main.css
View file
Open in desktop
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;
}
}