Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #64 from maxmanders/whiskymarch

Add section for Pre Conference Whisky March/Social.
  • Loading branch information...
commit 8bb03431aa4b93b8edb81902c43e5d38c8b1d975 2 parents c3ab0d2 + 4fab03d
Juozas "Joe" Kaziukėnas juokaz authored

Showing 2 changed files with 29 additions and 1 deletion. Show diff stats Hide diff stats

  1. +7 1 css/style.css
  2. +22 0 index.html
8 css/style.css
@@ -437,11 +437,17 @@ section h1:before {
437 437 background-position: 50px 65px;
438 438 background-image: url(../img/info_icon1.png);
439 439 }
440   -.whisky-guide {
  440 +.whisky-guide,
  441 +.whiskymarch {
441 442 background-position: 50px 65px;
442 443 background-image: url(../img/info_icon3.png);
443 444 }
444 445
  446 +.whiskymarch li {
  447 + line-height: 18px;
  448 + font-size: 12px;
  449 +}
  450 +
445 451 .information-section .active h2 {
446 452 background: url(../img/collapse.png) no-repeat 10px center;
447 453 margin-bottom: 10px;
22 index.html
@@ -121,6 +121,28 @@ <h2 class="date">
121 121 </div>
122 122
123 123 <div class="item active">
  124 + <h2>Pre-Confrence WhiskyMarch</h2>
  125 + <div class="inner whiskymarch">
  126 + <p>Inspired by <a href="http://wwww.whiskeymar.ch">Whiskeymar.ch</a>, the organisers of Whisky Web
  127 + would like to invite delegates and speakers to join them for a little pre-conference socialising
  128 + on Thursday 12 April.</p>
  129 +
  130 + <p>Having sought <a href="http://twitter.com/WhiskyCraig">Craig's</a> advice on some central Edinburgh
  131 + bars that offer a wide variety of Whiskies, we've put together a short tour of those fine establishments
  132 + so that we can all meet up before the main event. We'll get started at the first bar around 19:30 but
  133 + keep an eye out for hashtag #whiskywebsocial to check where we are!</p>
  134 +
  135 + <ol>
  136 + <li>Kilderkin, 65 Canongate, EH8 8BT</li>
  137 + <li>The Canon's Gait Inn, 232 Canongate, EH8 8DQ</li>
  138 + <li>The Albanach, 197 High Street, EH1 1PE</li>
  139 + <li>The Doric, 15-16 Market Street, EH1 1DE</li>
  140 + <li>Whiski Bar, 119 High Street, EH1 1SG</li>
  141 + </ol>
  142 + </div>
  143 + </div>
  144 +
  145 + <div class="item active">
124 146 <h2>How to get to the Conference</h2>
125 147 <div class="inner how-to-get-there">
126 148 <p>The Hub is situated on Castlehill, adjacent to Edinburgh Castle in the very heart of

0 comments on commit 8bb0343

Please sign in to comment.
Something went wrong with that request. Please try again.