Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

responsive update #8

Merged
merged 2 commits into from
Oct 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion docs/404.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
<meta charset="utf-8">
<title>NTUOSS TGIFHacks</title>
<base href="/">

<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link rel="stylesheet" href="styles.23de9ed57d18e5e7d50e.css"></head>
<body>
<app-root></app-root>
<script type="text/javascript" src="runtime.a66f828dca56eeb90e02.js"></script><script type="text/javascript" src="polyfills.7a0e6866a34e280f48e7.js"></script><script type="text/javascript" src="main.230bd5357a37c110625e.js"></script></body>
<script type="text/javascript" src="runtime.a66f828dca56eeb90e02.js"></script><script type="text/javascript" src="polyfills.7a0e6866a34e280f48e7.js"></script><script type="text/javascript" src="main.39541ac15afb25019b0a.js"></script></body>
</html>
3 changes: 2 additions & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
<meta charset="utf-8">
<title>NTUOSS TGIFHacks</title>
<base href="/">

<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link rel="stylesheet" href="styles.23de9ed57d18e5e7d50e.css"></head>
<body>
<app-root></app-root>
<script type="text/javascript" src="runtime.a66f828dca56eeb90e02.js"></script><script type="text/javascript" src="polyfills.7a0e6866a34e280f48e7.js"></script><script type="text/javascript" src="main.230bd5357a37c110625e.js"></script></body>
<script type="text/javascript" src="runtime.a66f828dca56eeb90e02.js"></script><script type="text/javascript" src="polyfills.7a0e6866a34e280f48e7.js"></script><script type="text/javascript" src="main.39541ac15afb25019b0a.js"></script></body>
</html>

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
<div class="backdrop"></div>
<router-outlet></router-outlet>
<div class="backdrop">
<router-outlet></router-outlet>
</div>
3 changes: 1 addition & 2 deletions src/app/app.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ $background-img: 'https://www.toptal.com/designers/subtlepatterns/patterns/funky
.backdrop {
position: absolute;
width: 100%;
height: 100%;
height: auto;
top: 0;
z-index: -1;
background: url($background-img);
animation: 100s scroll infinite linear;
}
10 changes: 5 additions & 5 deletions src/app/pages/home/home.component.html
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<div class="home-container">
<div class="home-header">
<img class="logo" src="../../../assets/logo.png">
<h2>{{event.subTitle}}</h2>
<h1>{{event.title}}</h1>
<h1 class="subTitle">{{event.subTitle}}</h1>
<h1 class="title">{{event.title}}</h1>
<br>
<h5>{{event.date}}</h5>
<h5>{{event.time}}</h5>
<h5>{{event.venue}}</h5>
<h1 class="info">{{event.date}}</h1>
<h1 class="info">{{event.time}}</h1>
<h1 class="info">{{event.venue}}</h1>
</div>
<div class="links-container">
<div class="card" *ngFor="let link of links">
Expand Down
32 changes: 23 additions & 9 deletions src/app/pages/home/home.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,15 @@
flex-direction: column;
padding-top: 6vmin;
}

.title,
.subTitle {
font-size: 2rem;
}
.info {
font-size: 1.5rem;
color: rgb(27,27,27);
font-weight: 300;
}
.footer {
padding-top: 12vmin;
width: 100%;
Expand All @@ -16,7 +24,6 @@

.home-header {
flex: 1;

img.logo {
width: 300px;
margin-bottom: 2vmin;
Expand All @@ -37,20 +44,14 @@
background: rgba(white, 0.6);
text-align: center;

&:first-of-type {
margin-left: 0px;
}

&:last-of-type {
margin-right: 0px;
}

.qr-code-wrapper {
text-align: center;
padding: 4vmin;
padding-top: 2vmin;

.qr-code {
transform: translateX(calc(30vmin*10/740/2));
height: 30vmin;
width: 30vmin;
margin-right: -6vmin;
Expand All @@ -59,3 +60,16 @@
}
}
}
@media screen and (max-width: 760px) {
.title,
.subTitle,
.info {
font-size: 1.2rem;
}
.home-header {
text-align: center;
}
.links-container {
flex-flow: column;
}
}
16 changes: 8 additions & 8 deletions src/app/pages/home/home.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import { Component, OnInit } from '@angular/core';
export class HomeComponent implements OnInit {

event: Event = {
subTitle: 'TGIFHacks #86',
title: 'Shopee: Developing High Performance Web Apps',
date: 'Friday, 28 September 2018',
subTitle: 'TGIFHacks #87',
title: 'Unity Game Development: Rebuilding Super Mario Bros',
date: 'Friday, 12 October 2018',
time: '6:30 PM - 8:30 PM Singapore Standard Time',
venue: 'NTU LT1 Block NS3 NS3-02-09'
};
Expand All @@ -21,11 +21,11 @@ export class HomeComponent implements OnInit {
url: 'https://links.ntuoss.com/ask',
qrUrl: 'https://links.ntuoss.com/ask.qr'
},
// {
// title: 'Workshop Content',
// url: 'https://links.ntuoss.com/workshop',
// qrUrl: 'https://links.ntuoss.com/workshop.qr'
// },
{
title: 'Workshop Content',
url: 'https://links.ntuoss.com/workshop',
qrUrl: 'https://links.ntuoss.com/workshop.qr'
},
{
title: 'Workshop Feedback',
url: 'https://links.ntuoss.com/feedback',
Expand Down