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

open flex for large screen #40

Merged
merged 2 commits into from
Oct 5, 2016
Merged

open flex for large screen #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f4b4ce
Revert "Revert "close #16 for every one with high res screen (#27)""
butlerx Oct 4, 2016
4e06b87
move title to header
butlerx Oct 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions 2015/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,20 +31,24 @@
</head>
<body>
<div class="wrapper">
<header>
<h1 class="title"><a href="/"><span class="title__colour">Tech</span>Week</a></h1>
<p>Dublin City University 9<sup>th</sup> - 13<sup>th</sup> March 2015</p>
<ul class="menu">
<li class="menu__item">
<a href="../2016">Feb 2016</a>
</li>
<li>
<a href="..">Oct 2016</a>
</li>
</ul>
</header>
<div class="container playlist">
<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>
<div class="sub-wrap">
<header class="title">
<h1 class="title__text"><a href="/"><span class="title__text__colour">Tech</span>Week</a></h1>
<p>Dublin City University 9<sup>th</sup> - 13<sup>th</sup> March 2015</p>
<ul class="menu">
<li class="menu__item">
<a href="../2016">Feb 2016</a>
</li>
<li>
<a href="..">Oct 2016</a>
</li>
</ul>
</header>
<main>
<div class="container playlist">
<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>
</div>
</main>
</div>
<!-- All events are loaded into this element -->
<div class="card-container">
Expand Down
32 changes: 18 additions & 14 deletions 2016/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,24 @@
</head>
<body>
<div class="wrapper">
<header>
<h1 class="title"><a href="/"><span class="title__colour">Tech</span>Week</a></h1>
<p>Dublin City University 15<sup>th</sup> - 19<sup>th</sup> Febuary 2015</p>
<ul class="menu">
<li class="menu__item">
<a href="../2015">2015</a>
</li>
<li class="menu__item">
<a href="..">Oct 2016</a>
</li>
</ul>
</header>
<div class="container playlist">
<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>
<div class="sub-wrap">
<header class="title">
<h1 class="title__text"><a href="/"><span class="title__text__colour">Tech</span>Week</a></h1>
<p>Dublin City University 15<sup>th</sup> - 19<sup>th</sup> Febuary 2015</p>
<ul class="menu">
<li class="menu__item">
<a href="../2015">2015</a>
</li>
<li class="menu__item">
<a href="..">Oct 2016</a>
</li>
</ul>
</header>
<main>
<div class="container playlist">
<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>
</div>
</main>
</div>
<!-- All events are loaded into this element -->
<div class="card-container">
Expand Down
60 changes: 31 additions & 29 deletions css/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,37 +9,39 @@ body {
flex-wrap: wrap;
justify-content: center;

.title {
margin: $title-margin;
text-align: center;

&__text {
margin: $text-margin;
font-size: $title-font-size;
font-weight: $title-font-weight;

&__colour {
color: $color-red;
font-weight: $title-colored-font-weight;
.sub-wrap {
.title {
margin: $title-margin;
text-align: center;

&__text {
margin: $text-margin;
font-size: $title-font-size;
font-weight: $title-font-weight;

&__colour {
color: $color-red;
font-weight: $title-colored-font-weight;
}

a {
color: $color-black;
}
}

a {
color: $color-black;
}
}

.menu {
list-style-type: none;
margin: $menu-margin;
padding: 0;
overflow: hidden;
display: flex;
flex-wrap: wrap;
justify-content: center;

&__item {
float: left;
padding: 0 8px;
.menu {
list-style-type: none;
margin: $menu-margin;
padding: 0;
overflow: hidden;
display: flex;
flex-wrap: wrap;
justify-content: center;

&__item {
float: left;
padding: 0 8px;
}
}
}
}
Expand Down
58 changes: 31 additions & 27 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,33 +33,37 @@
</head>
<body>
<div class="wrapper">
<header>
<h1 class="title"><a href="/"><span class="title__colour">Tech</span>Week</a></h1>
<p>Dublin City University 24<sup>th</sup> - 28<sup>th</sup> October 2016</p>
<ul class="menu">
<li class="menu__item">
<a href="./2016">Feb 2016</a>
</li>
<li>
<a href="./2015">2015</a>
</li>
</ul>
</header>
<!-- Countdown is show up to 10 minutes before the event -->
<div class="countdown">
TechWeek Starts in:
<div class="countdown__counter">
<span>&nbsp;</span>
<span>&nbsp;</span>
<span>&nbsp;</span>
<span>&nbsp;</span>
</div>
</div>
<!-- 10 minutes before start of the event the livestream will come on -->
<div class="container livestream">
<video id="live" controls poster="https://www.redbrick.dcu.ie/includes/images/logo.png">
<source src="">
</video>
<div class="sub-wrap">
<header class="title">
<h1 class="title__text"><a href="/"><span class="title__text__colour">Tech</span>Week</a></h1>
<p>Dublin City University 24<sup>th</sup> - 28<sup>th</sup> October 2016</p>
<ul class="menu">
<li class="menu__item">
<a href="./2015">2015</a>
</li>
<li>
<a href="./2016">Feb 2016</a>
</li>
</ul>
</header>
<!-- Countdown is show up to 10 minutes before the event -->
<main>
<div class="countdown">
TechWeek Starts in:
<div class="countdown__counter">
<span>&nbsp;</span>
<span>&nbsp;</span>
<span>&nbsp;</span>
<span>&nbsp;</span>
</div>
</div>
<!-- 10 minutes before start of the event the livestream will come on -->
<div class="container livestream">
<video id="live" controls poster="https://www.redbrick.dcu.ie/includes/images/logo.png">
<source src="">
</video>
</div>
</main>
</div>
<!-- All events are loaded into this element -->
<div class="card-container">
Expand Down