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

Commit f5a50d9

Browse files
butlerxbutlerx
committed
close #16 for every one with high res screen
1 parent f349938 commit f5a50d9

File tree

4 files changed

+104
-88
lines changed

4 files changed

+104
-88
lines changed

Diff for: ‎2015/index.html

+16-14
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,22 @@
3535
</head>
3636
<body>
3737
<div class="wrapper">
38-
<header>
39-
<h1 class="title"><a href="/"><span class="title__colour">Tech</span>Week</a></h1>
40-
<p>Dublin City University 9<sup>th</sup> - 13<sup>th</sup> March 2015</p>
41-
<ul class="menu">
42-
<li class="menu__item">
43-
<a href="../2016">Feb 2016</a>
44-
</li>
45-
<li>
46-
<a href="..">Oct 2016</a>
47-
</li>
48-
</ul>
49-
</header>
50-
<div class="container playlist">
51-
<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>
38+
<div class="main">
39+
<header>
40+
<h1 class="title"><a href="/"><span class="title__colour">Tech</span>Week</a></h1>
41+
<p>Dublin City University 9<sup>th</sup> - 13<sup>th</sup> March 2015</p>
42+
<ul class="menu">
43+
<li class="menu__item">
44+
<a href="../2016">Feb 2016</a>
45+
</li>
46+
<li>
47+
<a href="..">Oct 2016</a>
48+
</li>
49+
</ul>
50+
</header>
51+
<div class="container playlist">
52+
<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>
53+
</div>
5254
</div>
5355
<!-- All events are loaded into this element -->
5456
<div class="card-container">

Diff for: ‎2016/index.html

+16-14
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,22 @@
3737
</head>
3838
<body>
3939
<div class="wrapper">
40-
<header>
41-
<h1 class="title"><a href="/"><span class="title__colour">Tech</span>Week</a></h1>
42-
<p>Dublin City University 15<sup>th</sup> - 19<sup>th</sup> Febuary 2015</p>
43-
<ul class="menu">
44-
<li class="menu__item">
45-
<a href="../2015">2015</a>
46-
</li>
47-
<li class="menu__item">
48-
<a href="..">Oct 2016</a>
49-
</li>
50-
</ul>
51-
</header>
52-
<div class="container playlist">
53-
<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>
40+
<div class="main">
41+
<header>
42+
<h1 class="title"><a href="/"><span class="title__colour">Tech</span>Week</a></h1>
43+
<p>Dublin City University 15<sup>th</sup> - 19<sup>th</sup> Febuary 2015</p>
44+
<ul class="menu">
45+
<li class="menu__item">
46+
<a href="../2015">2015</a>
47+
</li>
48+
<li class="menu__item">
49+
<a href="..">Oct 2016</a>
50+
</li>
51+
</ul>
52+
</header>
53+
<div class="container playlist">
54+
<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>
55+
</div>
5456
</div>
5557
<!-- All events are loaded into this element -->
5658
<div class="card-container">

Diff for: ‎css/main.less

+44-34
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,56 @@
11
@import url(//fonts.googleapis.com/css?family=Roboto:100,300,400);
22
@import "variables";
33

4-
header {
5-
text-align: center;
6-
7-
.title {
8-
margin: 0.5em 0;
9-
margin-bottom: 0.3em;
10-
font-size: 15vmin;
11-
font-weight: 100;
124

13-
&__colour {
14-
color: @color-red;
15-
font-weight: 300;
16-
}
17-
18-
a {
19-
color: @color-black;
20-
}
21-
}
5+
body {
6+
background-color: @color-grey;
227

23-
.menu {
24-
list-style-type: none;
25-
margin: 8px 0;
26-
padding: 0;
27-
overflow: hidden;
8+
.wrapper {
289
display: flex;
2910
flex-wrap: wrap;
3011
justify-content: center;
3112

32-
&__item {
33-
float: left;
34-
padding: 0 8px;
13+
.main {
14+
margin: 0 32px;
15+
16+
header {
17+
text-align: center;
18+
19+
.title {
20+
margin: 0.5em 0;
21+
margin-bottom: 0.3em;
22+
font-size: 15vmin;
23+
font-weight: 100;
24+
25+
&__colour {
26+
color: @color-red;
27+
font-weight: 300;
28+
}
29+
30+
a {
31+
color: @color-black;
32+
}
33+
}
34+
35+
.menu {
36+
list-style-type: none;
37+
margin: 8px 0;
38+
padding: 0;
39+
overflow: hidden;
40+
display: flex;
41+
flex-wrap: wrap;
42+
justify-content: center;
43+
44+
&__item {
45+
float: left;
46+
padding: 0 8px;
47+
}
48+
}
49+
}
3550
}
3651
}
3752
}
3853

39-
body {
40-
background-color: @color-grey;
41-
}
42-
43-
video {
44-
width: 100%;
45-
}
46-
4754
.day {
4855
margin-top: 1vh;
4956

@@ -134,10 +141,12 @@ ul {
134141

135142
.livestream {
136143
display: none;
144+
width: 100%;
137145
}
138146

139147
.playlist {
140148
display: block;
149+
width: 100%;
141150
}
142151

143152
.collapsible.popout>li {
@@ -153,6 +162,7 @@ ul {
153162
display: flex;
154163
align-items: center;
155164
justify-content: center;
165+
width: @card-width;
156166

157167
&__events {
158168
width: 80%;
@@ -162,7 +172,7 @@ ul {
162172
}
163173

164174
@media screen and (min-width: 800px) {
165-
max-width: @card-width;
175+
width: @card-width;
166176
}
167177
}
168178
}

Diff for: ‎index.html

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

0 commit comments

Comments
 (0)