Skip to content

Commit 62693d6

Browse files
lauraengelhardtlauraengelhardt
authored
Merge pull request #39 from lauraengelhardt/improve-layout-and-unify
Consolidate layouts and improve website appearance
2 parents a23613e + d80c1b7 commit 62693d6

29 files changed

+211
-455
lines changed

‎404.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
---
22
title: Page not found
3-
layout: page_serifheader
3+
layout: page
44
description: This page could not be found
55
permalink: "/404.html"
66
banner: true
7+
banner_hide_on_mobile: true
78
---
89

910
The page you are looking for is not available. Please navigate through the menu above.

‎_includes/footer.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="row">
44
<div class="col-12">
55
<div class="footer-inner">
6-
<h2 class="footer-title">{{site.title}}</h2>
6+
<span class="footer-title">{{site.title}}</span>
77
<ul>
88
{% assign footermenu = site.data.menus.footer | sort: 'weight' %} {%
99
for item in footermenu %}

‎_includes/header.html‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,13 @@
2323
</div>
2424

2525
{% if page.banner %}
26-
<div class="row">
27-
<div class="container-fluid">
28-
<p><br /><br /></p>
29-
<img
30-
alt="banner"
31-
class="image{% if page.banner_hide_on_mobile %} image-hide-mobile{% endif %}"
32-
src="{{ site.logo.banner | relative_url }}"
33-
width="100%"
34-
height="100%"
35-
/>
36-
</div>
26+
<div class="container-fluid p-0">
27+
<img
28+
alt="banner"
29+
class="image{% if page.banner_hide_on_mobile %} image-hide-mobile{% endif %}"
30+
src="{{ site.logo.banner | relative_url }}"
31+
width="100%"
32+
height="100%"
33+
/>
3734
</div>
3835
{% endif %}

‎_layouts/associated.html‎

Lines changed: 34 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,46 @@
22
layout: default
33
---
44

5-
<div class="container pb-6 pt-6 pt-md-6 pb-md-10">
6-
<h1>{{ page.title }}</h1>
7-
</div>
8-
9-
<div class="strip">
10-
<div class="container" pt-2 pb-2>
11-
<div class="row justify-content-start">
12-
<div class="col-12 col-md-7 col-lg-7 order-2 order-md-1">
13-
{{ content }}
14-
</div>
15-
{% if page.image %}
16-
<div
17-
class="col-12 col-md-5 col-lg-5 order-1 order-md-2 position-relative"
18-
>
19-
<img
20-
alt="{{ page.title }}"
21-
class="image {% if page.image_hide_on_mobile %} image-hide-mobile{% endif %}"
22-
src="{{ page.image | absolute_url }}"
23-
/>
24-
</div>
25-
{% endif %}
5+
<div class="container pb-2 pt-2">
6+
<div class="row justify-content-start">
7+
<div class="col-12 col-md-7 col-lg-7">
8+
<h1>{{ page.title }}</h1>
9+
<div class="content">{{content}}</div>
10+
</div>
11+
{% if page.image %}
12+
<div class="col-12 col-md-5 col-lg-5 position-relative">
13+
<img
14+
alt="{{ page.title }}"
15+
class="image{% if page.image_hide_on_mobile %} image-hide-mobile{% endif %}"
16+
src="{{ page.image | absolute_url }}"
17+
/>
2618
</div>
19+
{% endif %}
2720
</div>
2821
</div>
2922

30-
<div class="strip">
31-
<div class="container pt-6 pb-6">
32-
<div class="row justify-content-start">
33-
{% for associate in site.data.associated %}
34-
<div class="col-12 col-md-6 mb-1">
35-
<div class="feature">
36-
<div class="feature-image">
37-
<img
38-
alt="{{ feature.title }}"
39-
src="{{ associate.image.url | relative_url }}"
40-
width="auto"
41-
height="auto"
42-
/>
43-
</div>
44-
<h2 class="feature-title">{{ associate.title }}</h2>
45-
<div class="feature-content">{{ associate.description }}</div>
46-
{% if associate.link %}
47-
<div class="feature-content">
48-
<a href="{{ associate.link }}">Project link</a>
49-
</div>
50-
{% endif %}
23+
<div class="container pt-2 pb-6">
24+
<div class="row justify-content-start">
25+
{% for associate in site.data.associated %}
26+
<div class="col-12 col-md-6 mb-1">
27+
<div class="feature">
28+
<div class="feature-image">
29+
<img
30+
alt="{{ feature.title }}"
31+
src="{{ associate.image.url | relative_url }}"
32+
width="auto"
33+
height="auto"
34+
/>
35+
</div>
36+
<span class="feature-title">{{ associate.title }}</span>
37+
<div class="feature-content">{{ associate.description }}</div>
38+
{% if associate.link %}
39+
<div class="feature-content">
40+
<a href="{{ associate.link }}">Project link</a>
5141
</div>
42+
{% endif %}
5243
</div>
53-
{% endfor %}
5444
</div>
45+
{% endfor %}
5546
</div>
5647
</div>

‎_layouts/capabilities.html‎

Lines changed: 26 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,37 @@
11
---
22
layout: default
3-
bodyClass: "page-capabilities"
43
---
54

6-
<div class="container pb-6 pt-6 pt-md-6 pb-md-10">
7-
<div class="row justify-content-start">
8-
<div class="col-12 col-md-8">
9-
<h1>{{page.title}}</h1>
10-
<div class="service service-single pt-2">
11-
<div class="content_serifheader">{{content}}</div>
12-
</div>
13-
</div>
14-
</div>
5+
<div class="container pb-2 pt-2">
6+
<h1>{{page.title}}</h1>
7+
<div class="content">{{content}}</div>
158
</div>
169

17-
<div class="strip">
18-
<div class="container pt-6 pb-6">
19-
<h2>Examples</h2>
20-
<div class="row justify-content-start">
21-
{% for capability in site.data.examples %}
22-
<div class="col-12 col-md-4 mb-1">
23-
<div class="feature">
24-
{% if capability.image %}
25-
<div class="feature-image">
26-
<img
27-
alt="{{ feature.title }}"
28-
src="{{ capability.image.url | relative_url }}"
29-
width="auto"
30-
height="auto"
31-
/>
32-
</div>
33-
{% endif %}
34-
<h2 class="feature-title">{{ capability.title }}</h2>
35-
<div class="feature-content">{{ capability.description }}</div>
36-
{% if capability.link %}
37-
<div class="feature-content">
38-
<a href="{{ capability.link }}">Project link</a>
39-
</div>
40-
{% endif %}
10+
<div class="container pb-6 pt-0">
11+
<h2>Examples</h2>
12+
<div class="row justify-content-start">
13+
{% for capability in site.data.examples %}
14+
<div class="col-12 col-md-4 mb-1">
15+
<div class="feature">
16+
{% if capability.image %}
17+
<div class="feature-image">
18+
<img
19+
alt="{{ feature.title }}"
20+
src="{{ capability.image.url | relative_url }}"
21+
width="auto"
22+
height="auto"
23+
/>
24+
</div>
25+
{% endif %}
26+
<span class="feature-title">{{ capability.title }}</span>
27+
<div class="feature-content">{{ capability.description }}</div>
28+
{% if capability.link %}
29+
<div class="feature-content">
30+
<a href="{{ capability.link }}">Project link</a>
4131
</div>
32+
{% endif %}
4233
</div>
43-
{% endfor %}
4434
</div>
35+
{% endfor %}
4536
</div>
4637
</div>

‎_layouts/contact.html‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎_layouts/contributor.html‎

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,10 @@
11
---
22
layout: default
3-
bodyClass: "page-community"
4-
permalink: "/contributor/"
53
---
64

7-
<div class="container pt-2">
8-
<h1>{{ page.title }}</h1>
9-
</div>
10-
11-
<div class="container pt-2 pt-md-2">
12-
<div class="row justify-content-start">
13-
<div class="col-12 col-md-8">
14-
<div class="contributor contributor-single">
15-
<div class="content">{{content}}</div>
16-
</div>
17-
</div>
18-
</div>
5+
<div class="container pb-2 pt-2">
6+
<h1>{{page.title}}</h1>
7+
<div class="content">{{content}}</div>
198
</div>
209

2110
<div class="container pt-2 pb-2">
@@ -34,7 +23,7 @@ <h1>{{ page.title }}</h1>
3423
/>
3524
</div>
3625
{% endif %}
37-
<h2 class="feature-title">{{ institution.name }}</h2>
26+
<span class="feature-title">{{ institution.name }}</span>
3827
<a target="_blank" href="{{ contributor.institution.url }}">
3928
<div class="content">{{ institution.institute }}</div>
4029
</a>
@@ -44,14 +33,17 @@ <h2 class="feature-title">{{ institution.name }}</h2>
4433
</div>
4534
</div>
4635

47-
<div class="container">
36+
<div class="container pt-2 pb-6">
4837
<h2>Developer in alphabetical order</h2>
49-
5038
<div class="row justify-content-start">
51-
<ul>
52-
{% for dev in site.data.developer %}
53-
<li>{{ dev }}</li>
54-
{% endfor %}
55-
</ul>
39+
<div class="col-12">
40+
<div class="content">
41+
<ul>
42+
{% for dev in site.data.developer %}
43+
<li>{{ dev }}</li>
44+
{% endfor %}
45+
</ul>
46+
</div>
47+
</div>
5648
</div>
5749
</div>

‎_layouts/default.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
{% endif %}
4848
</head>
4949

50-
<body class="page {{layout.bodyClass}}">
50+
<body class="page {{ bodyClass }}">
5151
{% include main-menu-mobile.html %}
5252
<div id="wrapper" class="wrapper">
5353
{% include header.html headerClass='header-extra' %} {{content}}

0 commit comments

Comments
 (0)