Skip to content

Commit

Permalink
Merge pull request csvconf#27 from simonv3/gh-pages
Browse files Browse the repository at this point in the history
Made a new poster and updated a link to presenters
  • Loading branch information
max-mapper committed Mar 17, 2016
2 parents ae1106b + 1cd7568 commit 8b8e1d9
Show file tree
Hide file tree
Showing 6 changed files with 1,814 additions and 22 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules
.DS_Store
.DS_Store
_site
24 changes: 14 additions & 10 deletions css/custom.css
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* overrides */
/* overrides */

.buttonz a { padding: 0 !important; }
#schedule .btn-side { text-align: center; padding: 0px 20px; width: auto; }

.features-circle {
.features-circle {
background-size: 180px 180px;
background-color: #0097a7;
border: 6px solid #49556E;
Expand All @@ -19,25 +19,25 @@
margin: 0 -12px 0 -14px;
}

#speakers .features-list .features-item a {
.speakers .features-list .features-item a {
text-decoration: none;
}

#speakers .features-list .features-item {
.speakers .features-list .features-item {
width: 25%;
height: 400px;
}

#speakers .features-list h3 {
.speakers .features-list h3 {
font-size: 20px;
}

#speakers .features-list h4 {
.speakers .features-list h4 {
font-size: 20px;
border-bottom: 1px solid white;
}

.site-header {
.site-header {
border-top: 5px solid #0097a7;
background-color: #F7F7F7;
text-shadow: none;
Expand All @@ -51,8 +51,8 @@
.section-signup h3, .section-signup h4 { color: white; }

.presentation-list .bio { font-style: italic; margin: 10px 0; }
.presentation-list h3 { text-decoration: underline; }
.presentation-list h4 { font-size: 1.525rem; color: #ca2470; }
.presentation-list h3 { text-decoration: underline; }
.presentation-list h4 { font-size: 1.525rem; color: #ca2470; }

.site-header .logo { color: black; }

Expand Down Expand Up @@ -82,7 +82,11 @@ header { position: relative; }
header .row { z-index: 2; position: relative; }
.section-signup, .signup-subtitle { color: white; }
.signup-title { margin-bottom: 40px; }
.section-signup a { color: white; text-decoration: underline; }
.section-signup a:not(.btn-side) { color: white; text-decoration: underline; }
.section-signup a.btn-side {
margin-top: 1rem;
padding: .75rem 0;
}

.subheader { text-align: center; color: white; text-transform: uppercase; }
.open-knowledge-foundation, .dat { width: 150px; float: right; }
Expand Down
1,783 changes: 1,783 additions & 0 deletions img/buy-tickets-2016.ai

Large diffs are not rendered by default.

Binary file added img/buy-tickets-2016.pdf
Binary file not shown.
Binary file added img/buy-tickets-2016.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 15 additions & 11 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ <h1 class="logo">csv<span>,</span>conf<span>,</span>v2</h1>
</header>
<main role="main" class="site-main-content">
<span class="easteregg" style="display: none;">Above is live earthquake data from a NOAA CSV. <a href="?csv=https://raw.githubusercontent.com/datasets/house-prices-uk/master/data/data.csv">Try rendering a different CSV.</a></span>
<section id="speakers" class="site-section section-signup">

<section id="speakers" class="site-section section-signup speakers">
<div class="row">
<div class="twelve columns animate-on-scroll" data-scrollanimation="fadeDownIn">
<h3 id="keynotes" class="signup-title">Keynote Speakers</h3>
Expand Down Expand Up @@ -95,11 +95,15 @@ <h3>Researcher, writer and information activist whose work focuses on bridging t
</li>
</ul>
<div class="row" style="padding-top: 90px;">
<h3>More speakers to be announced soon. <a href="http://www.eventbrite.com/e/csvconfv2-tickets-22105704758" target="_blank">Tickets Available Here</a>.</h3>
<h3>See the full <a href="#presenters">list of speakers</a>.

<p>
<a href="http://www.eventbrite.com/e/csvconfv2-tickets-22105704758" target="_blank" class="btn-side animate-on-scroll scroll-animation-init fadeInLeft" data-scrollanimation="fadeInLeft">Get Your Ticket</a>
</p>
</div>
</div>
</section>

<section id="about" class="site-section section-features" data-target="features">
<center><a href="/2014"><img width="100%" src="img/2014-group.jpg"></a></center>

Expand Down Expand Up @@ -131,8 +135,8 @@ <h3>csv,conf is made possible by the following generous sponsors</h3>
</div>
</div>
</section>
<section id="speakers" class="site-section section-signup">

<section id="presenters" class="site-section section-signup speakers">
<div class="row">
<div class="twelve columns animate-on-scroll" data-scrollanimation="fadeDownIn">
<h3 class="signup-title" id="presenters">Presenters</h3>
Expand Down Expand Up @@ -354,10 +358,10 @@ <h4>Greg McMullen</h4>
<div class="row">
<h3>More speakers to be announced soon.</h3>
</div>

</div>
</div>

</section>

<section id="schedule" class="site-section section-testimonials">
Expand All @@ -366,20 +370,20 @@ <h4 id="location">Location</h4>
<p>Conference venue is the <a href="http://www.kalkscheune.de/en">Kalkscheune</a> in Central Berlin.</p>
<p>Google Maps: <a href="https://www.google.com/maps/place/Kalkscheune/@52.5251031,13.3914223,16z/data=!4m2!3m1!1s0x47a851e837c93643:0xd44c06c0d6ff5dda">Kalkscheune, Johannisstr. 2, 10117 Berlin, Germany</a></p>
<h4 id="schedule">Daily schedule coming soon!</h4>

<h4>More Information</h4>
<p>CSVConf strives to be a supportive and welcoming environment to all attendees. We encourage you to read the <a href="http://confcodeofconduct.com/">Conf Code of Conduct</a> and will be enforcing it.</a>
<p>For any questions contact <a href="https://twitter.com/csvconference">@csvconference</a> or csv-conf-coord at googlegroups dot com</a>
<a href="http://www.kalkscheune.de/en"><img style="margin-left: 20px" src="img/kalkscheune.png"></a>
<h4 id="documents">Documents</h4>
<p>Here is our announcement poster, sticker template and sponsorship prospectus.</p>
<p>
<a href="img/poster-2016.png"><img width="200" src="img/poster-2016.png"></img></a>
<a href="img/buy-tickets-2016.png"><img width="200" src="img/buy-tickets-2016.png"></img></a>
<a style="padding-left: 20px;" href="img/sticker-2016.png"><img width="200" src="img/sticker-2016.png"></img></a>
<a style="padding-left: 20px;" href="img/confconferencev2_sponsorship.pdf"><img width="200" src="img/sponsorship.png"></img></a>
</p>
</div>

<div class="row" style="text-align: center;">
<h3>Check out csv,conf,v1</h3>
<p>The first csv,conf was held in 2014. We hosted 30 talks all over the data spectrum including <a href="https://www.youtube.com/watch?v=a8piOmSsJ2I">upcoming CSV standards from the W3C</a>, <a href="https://www.youtube.com/watch?v=U2NcQVk5HtQ">scientific data testing tools in R</a>, and <a href="https://www.youtube.com/watch?v=NhhJmgXKSJI">how to query data from Wikipedia</a>.</p>
Expand Down

0 comments on commit 8b8e1d9

Please sign in to comment.