Skip to content

Commit

Permalink
resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
paulca committed Feb 1, 2017
2 parents b662626 + e1619fe commit 906aae9
Show file tree
Hide file tree
Showing 10 changed files with 174 additions and 15 deletions.
30 changes: 30 additions & 0 deletions code-of-conduct.html
Expand Up @@ -68,6 +68,36 @@ <h4>Aoife Reaper-Reynolds — aoife@ull.ie</h4>
</div>
</div>

<div class="footer-links flexbox">
<a href="why-ull.html" class="buy-button link small-box">
<h3>Why Úll</h3>
</a>

<a href="participate.html" class="buy-button link small-box">
<h3>Participate</h3>
</a>

<a href="presenters.html" class="buy-button link small-box">
<h3>Presenters</h3>
</a>

<a href="logistics.html" class="buy-button link small-box">
<h3>Logistics</h3>
</a>

<a href="schedule.html" class="buy-button link small-box">
<h3>Schedule</h3>
</a>

<a href="tickets.html" class="buy-button link small-box">
<h3>Tickets</h3>
</a>

<!-- <a href="sponsor.html" class="buy-button link small-box">
<h3>Sponsor</h3>
</a> -->
</div>

<div class="footer">
<h6>A production of Úll Conferences Limited, registered in Ireland, company number 535856. VAT number IE3382039RH.</h6>
<h6>View our <a href="http://opensourcebridge.org/about/code-of-conduct/">code of conduct</a>.</h6>
Expand Down
3 changes: 2 additions & 1 deletion css/style.css
Expand Up @@ -52,7 +52,7 @@ a {
}

p a {
color: #666;
color: #444;
text-decoration: underline;
}

Expand Down Expand Up @@ -186,6 +186,7 @@ sup {
.content-column {
width: 1000px;
max-width: 88%;
min-height: 600px;
margin-left: auto;
margin-right: auto;
background-color: rgba(255, 255, 255, 0.95);
Expand Down
8 changes: 6 additions & 2 deletions index.html
Expand Up @@ -100,6 +100,10 @@ <h3>Why Úll</h3>
<h3>Participate</h3>
</a>

<a href="presenters.html" class="buy-button link small-box">
<h3>Presenters</h3>
</a>

<a href="logistics.html" class="buy-button link small-box">
<h3>Logistics</h3>
</a>
Expand All @@ -112,9 +116,9 @@ <h3>Schedule</h3>
<h3>Tickets</h3>
</a>

<a href="sponsor.html" class="buy-button link small-box">
<!-- <a href="sponsor.html" class="buy-button link small-box">
<h3>Sponsor</h3>
</a>
</a> -->
</div>

<p class="center">
Expand Down
8 changes: 6 additions & 2 deletions logistics.html
Expand Up @@ -164,6 +164,10 @@ <h3>Why Úll</h3>
<h3>Participate</h3>
</a>

<a href="presenters.html" class="buy-button link small-box">
<h3>Presenters</h3>
</a>

<a href="logistics.html" class="buy-button link small-box">
<h3>Logistics</h3>
</a>
Expand All @@ -176,9 +180,9 @@ <h3>Schedule</h3>
<h3>Tickets</h3>
</a>

<a href="sponsor.html" class="buy-button link small-box">
<!-- <a href="sponsor.html" class="buy-button link small-box">
<h3>Sponsor</h3>
</a>
</a> -->
</div>

<p class="center"><a href="https://ti.to/ull/2017/interested_users/new" >Sign up to join our mailing list</a></p>
Expand Down
8 changes: 6 additions & 2 deletions participate.html
Expand Up @@ -133,6 +133,10 @@ <h3>Why Úll</h3>
<h3>Participate</h3>
</a>

<a href="presenters.html" class="buy-button link small-box">
<h3>Presenters</h3>
</a>

<a href="logistics.html" class="buy-button link small-box">
<h3>Logistics</h3>
</a>
Expand All @@ -145,9 +149,9 @@ <h3>Schedule</h3>
<h3>Tickets</h3>
</a>

<a href="sponsor.html" class="buy-button link small-box">
<!-- <a href="sponsor.html" class="buy-button link small-box">
<h3>Sponsor</h3>
</a>
</a> -->
</div>

<p class="center"><a href="https://ti.to/ull/2017/interested_users/new" >Sign up to join our mailing list</a></p>
Expand Down
8 changes: 6 additions & 2 deletions presenters.html
Expand Up @@ -129,6 +129,10 @@ <h3>Why Úll</h3>
<h3>Participate</h3>
</a>

<a href="presenters.html" class="buy-button link small-box">
<h3>Presenters</h3>
</a>

<a href="logistics.html" class="buy-button link small-box">
<h3>Logistics</h3>
</a>
Expand All @@ -141,9 +145,9 @@ <h3>Schedule</h3>
<h3>Tickets</h3>
</a>

<a href="sponsor.html" class="buy-button link small-box">
<!-- <a href="sponsor.html" class="buy-button link small-box">
<h3>Sponsor</h3>
</a>
</a> -->
</div>

<p class="center">
Expand Down
8 changes: 6 additions & 2 deletions schedule.html
Expand Up @@ -201,6 +201,10 @@ <h3>Why Úll</h3>
<h3>Participate</h3>
</a>

<a href="presenters.html" class="buy-button link small-box">
<h3>Presenters</h3>
</a>

<a href="logistics.html" class="buy-button link small-box">
<h3>Logistics</h3>
</a>
Expand All @@ -213,9 +217,9 @@ <h3>Schedule</h3>
<h3>Tickets</h3>
</a>

<a href="sponsor.html" class="buy-button link small-box">
<!-- <a href="sponsor.html" class="buy-button link small-box">
<h3>Sponsor</h3>
</a>
</a> -->
</div>

<p class="center"><a href="https://ti.to/ull/2017/interested_users/new" >Sign up to join our mailing list</a></p>
Expand Down
100 changes: 100 additions & 0 deletions sponsor.html
@@ -0,0 +1,100 @@
<!DOCTYPE html>
<html lang="en">


<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Úll 2017 - Logistics</title>
<link href="css/style.css" rel="stylesheet">
<script src="https://use.typekit.net/cye5xxq.js"></script>
<script src="js/ull.js"></script>
<script>try{Typekit.load({ async: true });}catch(e){}</script>

<meta name="description" content="{{ page.description }}">
<meta name="robots" content="index, follow">
<meta name="author" content="Úll Conferences Limited">

<meta property="og:title" content="Úll 2016">
<meta property="og:site_name" content="Úll">
<meta property="og:url" content="http://2016.ull.ie">
<meta property="og:description" content="{{ page.description }}">
<meta property="og:type" content="business.business">

<meta name="twitter:card" content="summary">
<meta name="twitter:site" content="@ullconf">
<meta name="twitter:title" content="Úll 2016">
<meta name="twitter:description" content="{{ page.description }}">
<meta name="twitter:image:src" content="http://2016.ull.ie/images/queue-1.jpg">

<body>


<div class="content-column">

<a href="index.html">
<picture class="logo">
<source media="(max-width: 500px)" srcset="images/ull-outline-mobile.png">
<source media="(min-width: 500px)" srcset="images/ull-outline-mobile.png">
<img src="images/ull-outline.png" alt="Logo">
</picture>
</a>

<h1 class="center">Sponsor</h1>

<p class="center">
If you're interested in supporting Úll, please get in touch
</p>

<p class="center"><a href="mailto:sponsors@ull.ie">sponsors@ull.ie</a></p>

</div>

<div class="footer-links flexbox">
<a href="why-ull.html" class="buy-button link small-box">
<h3>Why Úll</h3>
</a>

<a href="participate.html" class="buy-button link small-box">
<h3>Participate</h3>
</a>

<a href="presenters.html" class="buy-button link small-box">
<h3>Presenters</h3>
</a>

<a href="logistics.html" class="buy-button link small-box">
<h3>Logistics</h3>
</a>

<a href="schedule.html" class="buy-button link small-box">
<h3>Schedule</h3>
</a>

<a href="tickets.html" class="buy-button link small-box">
<h3>Tickets</h3>
</a>

<!-- <a href="sponsor.html" class="buy-button link small-box">
<h3>Sponsor</h3>
</a> -->
</div>

<p class="center"><a href="https://ti.to/ull/2017/interested_users/new" >Sign up to join our mailing list</a></p>

<div class="footer">
<h6>A production of Úll Conferences Limited, registered in Ireland, company number 535856. VAT number IE3382039RH.</h6>
<h6>View our <a href="http://opensourcebridge.org/about/code-of-conduct/">code of conduct</a>.</h6>
<h6>Feedback? Want to sponsor? <a href="">Get in touch</a>.</h6>
<h6>Previously: <a href="http://2012.ull.ie">2012</a>, <a href="http://2013.ull.ie">2013</a>, <a href="http://2014.ull.ie">2014</a>, <a href="http://2015.ull.ie">2015</a> &amp; <a href="http://2016.ull.ie">2016</a>.</h6>
<h6><a href="https://github.com/ullconf/2016">Pull requests accepted</a>.</h6>
</div>
</body>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>

<script>
var shapes = ['square', 'circle', 'triangle'];
var random_shape = shapes[Math.floor(Math.random() * shapes.length)];
$(document.body).addClass(random_shape)
</script>
8 changes: 6 additions & 2 deletions tickets.html
Expand Up @@ -147,6 +147,10 @@ <h3>Why Úll</h3>
<h3>Participate</h3>
</a>

<a href="presenters.html" class="buy-button link small-box">
<h3>Presenters</h3>
</a>

<a href="logistics.html" class="buy-button link small-box">
<h3>Logistics</h3>
</a>
Expand All @@ -159,9 +163,9 @@ <h3>Schedule</h3>
<h3>Tickets</h3>
</a>

<a href="sponsor.html" class="buy-button link small-box">
<!-- <a href="sponsor.html" class="buy-button link small-box">
<h3>Sponsor</h3>
</a>
</a> -->
</div>

<p class="center"><a href="https://ti.to/ull/2017/interested_users/new" >Sign up to join our mailing list</a></p>
Expand Down
8 changes: 6 additions & 2 deletions why-ull.html
Expand Up @@ -136,6 +136,10 @@ <h3>Why Úll</h3>
<h3>Participate</h3>
</a>

<a href="presenters.html" class="buy-button link small-box">
<h3>Presenters</h3>
</a>

<a href="logistics.html" class="buy-button link small-box">
<h3>Logistics</h3>
</a>
Expand All @@ -148,9 +152,9 @@ <h3>Schedule</h3>
<h3>Tickets</h3>
</a>

<a href="sponsor.html" class="buy-button link small-box">
<!-- <a href="sponsor.html" class="buy-button link small-box">
<h3>Sponsor</h3>
</a>
</a> -->
</div>

<p class="center"><a href="https://ti.to/ull/2017/interested_users/new" >Sign up to join our mailing list</a></p>
Expand Down

0 comments on commit 906aae9

Please sign in to comment.