Skip to content

Commit

Permalink
update header
Browse files Browse the repository at this point in the history
  • Loading branch information
oknono committed Oct 21, 2019
1 parent 195b6f6 commit 3b02031
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 13 deletions.
2 changes: 1 addition & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ collections:
theme_settings:
# Meta
title: "Aaron Swartz Day"
subtitle: "CryptoBars"
subtitle: "CryptoBar"
avatar: assets/img/ifh_logo_square.png
gravatar: # Email MD5 hash
description: "This year, the Internet Freedom Hack community will be participating in the Aaron Swartz Day CryptoBar events across Melbourne, Brisbane, and Sydney." # used by search engines
Expand Down
13 changes: 7 additions & 6 deletions _includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ <h1 class="site-title">
<a href="{{ site.baseurl }}/">{{ site.theme_settings.title }}<span class="hide-mobile">: {{site.theme_settings.subtitle }}</span></a>
</h1>
</div>
<nav class="site-nav">

<!-- We only want one page for the moment -->
<!--<nav class="site-nav">
<ul>
{% for event in site.events %}
<li>
Expand All @@ -24,12 +26,12 @@ <h1 class="site-title">
{% if event != site.events.last %}
<li>•</li>
{% endif %}
{% endfor %}
{% endfor %} -->
<!-- Social icons from Font Awesome, if enabled -->
{% include icons.html %}
<!--{% include icons.html %}-->

<!-- Search bar -->
{% if site.theme_settings.search %}
<!--{% if site.theme_settings.search %}
<li>
<form action="{{ site.baseurl }}/search.html" method="get">
<input type="text" id="search-box" name="query" placeholder="Search" class="">
Expand All @@ -40,6 +42,5 @@ <h1 class="site-title">
</li>
{% endif %}
</ul>
</nav>

</nav> -->
</header>
26 changes: 22 additions & 4 deletions _layouts/home.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,27 @@
<div class="call-out"
style="background-image: url('{{ site.baseurl }}/{{ site.theme_settings.header_text_feature_image }}')">
<div class="home-tint">
<!-- Hardcoded for AS day -->
<!-- <h1 id="hackathon-title">
{{ site.theme_settings.title }}: <span class="asd-lighter">{{site.theme_settings.subtitle }}</span>
</h1>
-->
<h1 id="hackathon-title">
{{ site.theme_settings.title }}: {{site.theme_settings.subtitle }}
<span class="capitalize">Aaron Swartz Day</span> <span class="asd-lighter">CryptoBar</span>
</h1>
<!-- Hardcoded for AS day -->
<h2 class="asd-subtitle">Friendly nerds help you secure your stuff</h2>
<p class="asd-when">6-8 PM, Thursday 7 November, Thoughtworks Offices</p>
<p class="asd-where"><b>Melbourne:</b> Level 23, 303 Collins Street</p>
<p class="asd-where"><b>Sydney:</b> Level 10, 50 Carrington Street</p>
<p class="asd-where"><b>Brisbane:</b> Level 19, 127 Creek Street</p>


<h4 id="brief-overview">
<!--<h4 id="brief-overview">
{{ site.theme_settings.header_text }}
</h4>
</h4> -->

<div id="locations">
<!-- <div id="locations">
{% for event in site.events %}
<div class="city-info">
<div class="event-title">
Expand All @@ -32,9 +44,15 @@ <h4 id="brief-overview">
</div>
{% endfor %}
</div>
-->
</div>
</div>

<!-- Hardcoded for AS day -->
<section class="asd-rsvp">
<b>FREE</b> event, <b>RSVP</b> essential <a class="homepage-button" href="https://pretix.eu/thoughtworks/ASDay2019/">https://pretix.eu/thoughtworks/ASDay2019/</a>
</section>

<section class="partners-or-sponsors">
<h1>Partners</h1>
<div class="grid">
Expand Down
40 changes: 38 additions & 2 deletions assets/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,50 @@ h1 {
display: none;
}
}


input, textarea {
display: block;
margin: 0.5rem 0 1.5rem 0;
width: 100%;
}

h1#hackathon-title {
font-size: 3em;
}

h1#hackathon-title .capitalize {
text-transform: capitalize;
}

.asd-when {
//text-align: left;
font-size: 1.5em;
}
.asd-where {
//text-align: left;
font-size: 1.3em;
}

.asd-lighter {
font-weight:300;
text-transform: initial;
}
.asd-subtitle {
color: rgb(252, 250, 62);
font-size: 2em;
font-style: italic;
font-weight:300;
text-transform: initial;
}

.asd-rsvp {
@extend %padding-small;
width: 100%;
background-color: rgb(252, 250, 62);
color: black;
text-align: center;
font-size: 1.5em;
}

section.speakers-or-judges, section.location, section.partners-or-sponsors {
@extend %padding-regular;
width: 100%;
Expand Down

0 comments on commit 3b02031

Please sign in to comment.