Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit b73a048

Browse files
SeanHealy33SeanHealy33
authored
Merge pull request #38 from redbrick/seanhealy/revert
Revert "close #16 for every one with high res screen (#27)"
2 parents 8836edf + 15f1ad7 commit b73a048

File tree

3 files changed

+55
-67
lines changed

3 files changed

+55
-67
lines changed

‎2015/index.html

+14-18
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,20 @@
3131
</head>
3232
<body>
3333
<div class="wrapper">
34-
<div class="title">
35-
<header>
36-
<h1 class="title__text"><a href="/"><span class="title__text__colour">Tech</span>Week</a></h1>
37-
<p>Dublin City University 9<sup>th</sup> - 13<sup>th</sup> March 2015</p>
38-
<ul class="menu">
39-
<li class="menu__item">
40-
<a href="../2016">Feb 2016</a>
41-
</li>
42-
<li>
43-
<a href="..">Oct 2016</a>
44-
</li>
45-
</ul>
46-
</header>
47-
<main>
48-
<div class="container playlist">
49-
<iframe id="live" src="https://www.youtube.com/embed/videoseries?list=PLPaLJSHTDMFgYNnnEOjuvdm6WqOFTSQ9z" width="100%" height="400" marginwidth="0" marginheight="0" scrolling="no" frameborder="0" webkitallowfullscreen="" allowfullscreen=""></iframe>
50-
</div>
51-
</main>
34+
<header>
35+
<h1 class="title"><a href="/"><span class="title__colour">Tech</span>Week</a></h1>
36+
<p>Dublin City University 9<sup>th</sup> - 13<sup>th</sup> March 2015</p>
37+
<ul class="menu">
38+
<li class="menu__item">
39+
<a href="../2016">Feb 2016</a>
40+
</li>
41+
<li>
42+
<a href="..">Oct 2016</a>
43+
</li>
44+
</ul>
45+
</header>
46+
<div class="container playlist">
47+
<iframe id="live" src="https://www.youtube.com/embed/videoseries?list=PLPaLJSHTDMFgYNnnEOjuvdm6WqOFTSQ9z" width="100%" height="400" marginwidth="0" marginheight="0" scrolling="no" frameborder="0" webkitallowfullscreen="" allowfullscreen=""></iframe>
5248
</div>
5349
<!-- All events are loaded into this element -->
5450
<div class="card-container">

‎2016/index.html

+14-18
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,20 @@
3333
</head>
3434
<body>
3535
<div class="wrapper">
36-
<div class="title">
37-
<header>
38-
<h1 class="title__text"><a href="/"><span class="title__text__colour">Tech</span>Week</a></h1>
39-
<p>Dublin City University 15<sup>th</sup> - 19<sup>th</sup> Febuary 2015</p>
40-
<ul class="menu">
41-
<li class="menu__item">
42-
<a href="../2015">2015</a>
43-
</li>
44-
<li class="menu__item">
45-
<a href="..">Oct 2016</a>
46-
</li>
47-
</ul>
48-
</header>
49-
<main>
50-
<div class="container playlist">
51-
<iframe id="live" src="https://www.youtube.com/embed/videoseries?list=PLPaLJSHTDMFhbDmyUeik6IHXmzVtWQQxu" width="100%" height="400" marginwidth="0" marginheight="0" scrolling="no" frameborder="0" webkitallowfullscreen="" allowfullscreen=""></iframe>
52-
</div>
53-
</main>
36+
<header>
37+
<h1 class="title"><a href="/"><span class="title__colour">Tech</span>Week</a></h1>
38+
<p>Dublin City University 15<sup>th</sup> - 19<sup>th</sup> Febuary 2015</p>
39+
<ul class="menu">
40+
<li class="menu__item">
41+
<a href="../2015">2015</a>
42+
</li>
43+
<li class="menu__item">
44+
<a href="..">Oct 2016</a>
45+
</li>
46+
</ul>
47+
</header>
48+
<div class="container playlist">
49+
<iframe id="live" src="https://www.youtube.com/embed/videoseries?list=PLPaLJSHTDMFhbDmyUeik6IHXmzVtWQQxu" width="100%" height="400" marginwidth="0" marginheight="0" scrolling="no" frameborder="0" webkitallowfullscreen="" allowfullscreen=""></iframe>
5450
</div>
5551
<!-- All events are loaded into this element -->
5652
<div class="card-container">

‎index.html

+27-31
Original file line numberDiff line numberDiff line change
@@ -33,37 +33,33 @@
3333
</head>
3434
<body>
3535
<div class="wrapper">
36-
<div class="title">
37-
<header>
38-
<h1 class="title__text"><a href="/"><span class="title__text__colour">Tech</span>Week</a></h1>
39-
<p>Dublin City University 24<sup>th</sup> - 28<sup>th</sup> October 2016</p>
40-
<ul class="menu">
41-
<li class="menu__item">
42-
<a href="./2015">2015</a>
43-
</li>
44-
<li>
45-
<a href="./2016">Feb 2016</a>
46-
</li>
47-
</ul>
48-
</header>
49-
<!-- Countdown is show up to 10 minutes before the event -->
50-
<main>
51-
<div class="countdown">
52-
TechWeek Starts in:
53-
<div class="countdown__counter">
54-
<span>&nbsp;</span>
55-
<span>&nbsp;</span>
56-
<span>&nbsp;</span>
57-
<span>&nbsp;</span>
58-
</div>
59-
</div>
60-
<!-- 10 minutes before start of the event the livestream will come on -->
61-
<div class="container livestream">
62-
<video id="live" controls poster="https://www.redbrick.dcu.ie/includes/images/logo.png">
63-
<source src="">
64-
</video>
65-
</div>
66-
</main>
36+
<header>
37+
<h1 class="title"><a href="/"><span class="title__colour">Tech</span>Week</a></h1>
38+
<p>Dublin City University 24<sup>th</sup> - 28<sup>th</sup> October 2016</p>
39+
<ul class="menu">
40+
<li class="menu__item">
41+
<a href="./2016">Feb 2016</a>
42+
</li>
43+
<li>
44+
<a href="./2015">2015</a>
45+
</li>
46+
</ul>
47+
</header>
48+
<!-- Countdown is show up to 10 minutes before the event -->
49+
<div class="countdown">
50+
TechWeek Starts in:
51+
<div class="countdown__counter">
52+
<span>&nbsp;</span>
53+
<span>&nbsp;</span>
54+
<span>&nbsp;</span>
55+
<span>&nbsp;</span>
56+
</div>
57+
</div>
58+
<!-- 10 minutes before start of the event the livestream will come on -->
59+
<div class="container livestream">
60+
<video id="live" controls poster="https://www.redbrick.dcu.ie/includes/images/logo.png">
61+
<source src="">
62+
</video>
6763
</div>
6864
<!-- All events are loaded into this element -->
6965
<div class="card-container">

0 commit comments

Comments
 (0)