Merge lp:~mhall119/uds-project/add_evening_programme into lp:uds-project

[Michael Hall]

Adds the "Evening programme" events

Adds the "Evening programme" events as requested by Michelle

[Steve Edwards (steve-edwards)]

I'll replace the <b> tags with <strong>, but other than that it looks good.

review: Approve

=== modified file 'assets/css/site.css'
--- assets/css/site.css	2012-04-04 14:35:22 +0000
+++ assets/css/site.css	2012-04-19 00:54:19 +0000
@@ -303,7 +303,8 @@
 }
 
 .page-conference .row-hero div p,
-.page-conference .row-tracks div p {
+.page-conference .row-tracks div p,
+.page-conference .row-evening div p {
 	max-width: 540px;
 }
 
@@ -688,4 +689,4 @@
 .page-default .span-9 ul li {
 	list-style: disc;
 	list-style-position: inside;
-}
\ No newline at end of file
+}

=== modified file 'template-conference.php'
--- template-conference.php	2012-03-12 15:08:55 +0000
+++ template-conference.php	2012-04-19 00:54:19 +0000
@@ -23,6 +23,33 @@
 		</div>
 	</div><!-- END .row -->
 	
+	<div class="row row-evening">
+		<div class="span-12">
+			<h2>Evening programme</h2>
+			<p>
+				<b>Monday, 7th May</b><br />
+				<b>Time:</b> 19:00<br />
+				<b>Event:</b> Meet & Greet Welcome Event<br />
+				<b>Venue:</b> West Hall<br />
+				Food & drinks will be provided.<br />
+			</p>
+			<p>
+				<b>Thursday, 10th May</b><br />
+				<b>Time:</b> 19:30<br />
+				<b>Event:</b> The Demo Jam<br />
+				<b>Venue:</b> East Hall<br />
+				Cool demos followed by live music. Food & drinks will be provided.<br />
+			</p>
+			<p>
+				<b>Friday, 11th May</b><br />
+				<b>Time:</b> 19:00<br />
+				<b>Event:</b> UDS closing party - California dreamin' beach party!<br />
+				<b>Venue:</b> West Hall<br />
+				Food & drinks will be provided.<br />
+			</p>
+		</div>
+	</div><!-- END .row -->
+
 	<?php /*
 	<div class="row row-full-grey first">
 		<div class="clearfix">
@@ -117,4 +144,4 @@
 		</div>
 	</div><!-- END .row -->
 	
-<?php get_footer(); ?>
\ No newline at end of file
+<?php get_footer(); ?>