Skip to content

Commit

Permalink
Merge pull request #5 from Urban-Analytics-Technology-Platform/better…
Browse files Browse the repository at this point in the history 
…_images

Hero images, Turing Logo, better nav, Footer tweaks
  • Loading branch information
@stuartlynn
stuartlynn authored Oct 27, 2023
2 parents 7469beb + 6824359 commit 49e6b4d
Show file tree
Hide file tree
Showing 12 changed files with 108 additions and 75 deletions.
Binary file added public/images/clim_recal.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/digital_twins.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/land_use.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/liveability.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/urban_mobility.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/urban_mobility.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions src/assets-arcana/css/main.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2532,13 +2532,16 @@ input, select, textarea {
#header {
text-align: center;
padding: 2em 0 0 0;
background-image: url("/images/this-is-fine.png");
background: linear-gradient( rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5) ), url("/images/urban_analytics_programme.jpg");
background-size: cover;
background-repeat: no-repeat;
}

#header h1 {
padding: 0 0 2.75em 0;
margin-top: 2em;
margin-bottom: 2em;
color:white;
margin-bottom: 2em;
}

#header h1 a {
Expand Down
46 changes: 24 additions & 22 deletions src/components/Header.astro
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,48 @@
---
import "../assets-arcana/css/main.css";
import { getCollection } from "astro:content";
import TuringLogo from "../logo.svg"
interface Props {
title: string;
}
const { title } = Astro.props;
const projects = await getCollection("project");
const tier1Projects = projects.filter((project) => project.data.tier === 1);
const tier2Projects = projects.filter((project) => project.data.tier === 2);
---

<div id="header">
<!-- Logo -->
<div id="background">
<h1><a href="/index.html" id="logo">{title}</a></h1>
<div id="background" >
<div class='relative'>
<img width=150 src={TuringLogo.src} alt="Turing Logo" class="absolute" style="top:45px;left:45px" />;
<h1><a href="/index.html" id="logo">{title}</a></h1>
</div>
</div>

<!-- Nav -->
<nav id="nav">
<ul>
<li class="current"><a href="/index.html">Home</a></li>
<li><a href="/index.html">Home</a></li>
<li>
<a href="#">Tier 1 Projects</a>
<ul>
{tier1Projects.map((project)=>(
<li><a href={"/projects/"+project.slug}>{project.data.name}</a></li>
))}
</ul>
</li>
<li>
<a href="#">Dropdown</a>
<a href="#">Tier 2 Projects</a>
<ul>
<li><a href="#">Lorem dolor</a></li>
<li><a href="#">Magna phasellus</a></li>
<li><a href="#">Etiam sed tempus</a></li>
<li>
<a href="#">Submenu</a>
<ul>
<li><a href="#">Lorem dolor</a></li>
<li><a href="#">Phasellus magna</a></li>
<li><a href="#">Magna phasellus</a></li>
<li><a href="#">Etiam nisl</a></li>
<li><a href="#">Veroeros feugiat</a></li>
</ul>
</li>
<li><a href="#">Veroeros feugiat</a></li>
{tier2Projects.map((project)=>(
<li><a href={"/projects/"+project.slug}>{project.data.name}</a></li>
))}
</ul>
</li>
<li><a href="left-sidebar.html">Left Sidebar</a></li>
<li><a href="right-sidebar.html">Right Sidebar</a></li>
<li><a href="two-sidebar.html">Two Sidebar</a></li>
<li><a href="no-sidebar.html">No Sidebar</a></li>
</ul>
</nav>
</div>
21 changes: 2 additions & 19 deletions src/layouts/Base.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,8 @@ const title = "Urban Analytics Technology Platform";
<section class="col-3 col-6-narrower col-12-mobilep">
<h3>Links to Stuff</h3>
<ul class="links">
<li><a href="#">Mattis et quis rutrum</a></li>
<li><a href="#">Suspendisse amet varius</a></li>
<li><a href="#">Sed et dapibus quis</a></li>
<li><a href="#">Rutrum accumsan dolor</a></li>
<li><a href="#">Mattis rutrum accumsan</a></li>
<li><a href="#">Suspendisse varius nibh</a></li>
<li><a href="#">Sed et dapibus mattis</a></li>
</ul>
</section>
<section class="col-3 col-6-narrower col-12-mobilep">
<h3>More Links to Stuff</h3>
<ul class="links">
<li><a href="#">Duis neque nisi dapibus</a></li>
<li><a href="#">Sed et dapibus quis</a></li>
<li><a href="#">Rutrum accumsan sed</a></li>
<li><a href="#">Mattis et sed accumsan</a></li>
<li><a href="#">Duis neque nisi sed</a></li>
<li><a href="#">Sed et dapibus quis</a></li>
<li><a href="#">Rutrum amet varius</a></li>
<li><a href="https://www.turing.ac.uk/">Alan Turing Institute</a></li>
<li><a href="https://www.turing.ac.uk/research/research-programmes/urban-analytics">Urban Analytics Program</a></li>
</ul>
</section>
<section class="col-6 col-12-narrower">
Expand Down
34 changes: 34 additions & 0 deletions src/logo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
72 changes: 40 additions & 32 deletions src/pages/index.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,47 +13,55 @@ const tier2Projects = projects.filter((project) => project.data.tier === 2);
<section class="wrapper style1">
<div class="container">
<div class="row gtr-200">
<section class="col-4 col-12-narrower">
<div class="box highlight">
<img src="https://i.imgflip.com/83vtf4.jpg" alt="" />
<h3>This Is Important</h3>
<p>
Duis neque nisi, dapibus sed mattis et quis, nibh. Sed et dapibus
nisl amet mattis, sed a rutrum accumsan sed. Suspendisse eu.
</p>
</div>
</section>
<section class="col-4 col-12-narrower">
<div class="box highlight">
<img src="https://i.imgflip.com/83vtf4.jpg" alt="" />
<h3>Also Important</h3>
<p>
Duis neque nisi, dapibus sed mattis et quis, nibh. Sed et dapibus
nisl amet mattis, sed a rutrum accumsan sed. Suspendisse eu.
</p>
</div>
</section>
<section class="col-4 col-12-narrower">
<div class="box highlight">
<img src="https://i.imgflip.com/83vtf4.jpg" alt="" />
<h3>Probably Important</h3>
<p>
Duis neque nisi, dapibus sed mattis et quis, nibh. Sed et dapibus
nisl amet mattis, sed a rutrum accumsan sed. Suspendisse eu.
</p>
</div>
</section>
<section class="col-3 col-12-narrower">
<div class="box highlight">
<img class="hero-image" src="/images/digital_twins.jpg" alt="" />
<h3>Digital Twins</h3>
<p>How do we use new data and algorithms to simulate aspects of the urban environment and evaluate urban polices?</p>
</div>
</section>
<section class="col-3 col-12-narrower">
<div class="box highlight">
<img class="hero-image" style="object-fit: cover;" src="/images/land_use.jpg" alt="" />
<h3>Land Use</h3>
<p>How do we use new forms of data and AI to predict and optimize land use planning for buildings, cities and landscapes?</p>
</div>
</section>
<section class="col-3 col-12-narrower">
<div class="box highlight">
<img class="hero-image" style="object-fit: cover;" src="/images/urban_mobility.jpg" alt="" />
<h3>Urban Mobility</h3>
<p>How do we promote equity and efficiency in all forms of urban mobility? How do we help local and national governments improve public infrastructure?</p>
</div>
</section>
<section class="col-3 col-12-narrower">
<div class="box highlight">
<img class="hero-image" style="object-fit: cover;" src="/images/liveability.jpg" alt="" />
<h3>Liveability</h3>
<p>How do we promote health, sustainability and prosperity for city populations?</p>
</div>
</section>
</div>
</section>
</div>
</div>
</section>
<ProjectList
title="Tier 1 Projects"
description="These are really important!"
description="High-level applications driven by collaborations with partners and the theme priorities"
projects={tier1Projects}
/>
<ProjectList
title="Tier 2 Projects"
description="These are also really important!"
description="Low level packages and data that can be reused in many contexts"
projects={tier2Projects}
/>
</Base>

<style>
.hero-image{
object-fit: cover;
width:240px;
height:255px;
}
</style>
3 changes: 3 additions & 0 deletions src/pages/projects/[...slug].astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ const { Content } = await entry.render();
<h2>{entry.data.name}</h2>
<p>{entry.data.description}</p>
</header>
{entry.data.image &&
<img src={entry.data.image.url} alt={entry.data.image.alt} />
}
<Content />
</article>
</div>
Expand Down

0 comments on commit 49e6b4d

Please sign in to comment.