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

Sophie branch #165

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
ff84094
Add files via upload
sophiekirkham Sep 22, 2021
df5a4f4
Update other_services_page.html
sophiekirkham Sep 22, 2021
fadbe99
Update other_services_page.html
sophiekirkham Sep 22, 2021
0de7707
Delete annie-spratt-AFB6S2kibuk-unsplash.jpg
sophiekirkham Sep 22, 2021
03ce07e
Add files via upload
sophiekirkham Sep 22, 2021
342d8d5
Update other_services_page.html
sophiekirkham Sep 22, 2021
d66edd5
Update other_services_page.html
sophiekirkham Sep 22, 2021
3987cc0
Update thesis_search.html
sophiekirkham Sep 22, 2021
5fe178f
Update thesis_search.html
sophiekirkham Sep 22, 2021
98d0423
Update thesis_index_page.html
sophiekirkham Sep 24, 2021
3907a8c
Update thesis_index_page.html
sophiekirkham Sep 24, 2021
2730657
Add files via upload
sophiekirkham Sep 24, 2021
9514e76
Update style.css
sophiekirkham Sep 24, 2021
91ef3dc
Update thesis_index_page.html
sophiekirkham Sep 24, 2021
2c7f53d
Update style.css
sophiekirkham Sep 24, 2021
35b1e84
Add files via upload
sophiekirkham Sep 25, 2021
5311c69
Update thesis_search.html
sophiekirkham Sep 25, 2021
9362fc6
Update thesis_index_page.html
sophiekirkham Sep 25, 2021
974eb98
Update thesis_index_page.html
sophiekirkham Sep 25, 2021
80a9fec
Update thesis_index_page.html
sophiekirkham Sep 25, 2021
a268c9b
Update thesis_index_page.html
sophiekirkham Sep 25, 2021
428a60c
Update thesis_index_page.html
sophiekirkham Sep 25, 2021
50f520b
Update thesis_index_page.html
sophiekirkham Sep 25, 2021
d185b38
Update thesis_index_page.html
sophiekirkham Sep 25, 2021
e07157f
Update thesis_search.html
sophiekirkham Sep 25, 2021
5417ca0
Update thesis_search.html
sophiekirkham Sep 25, 2021
b846f73
Update thesis_search.html
sophiekirkham Sep 25, 2021
8fbdb75
Update thesis_index_page.html
sophiekirkham Sep 25, 2021
2ff04e8
Update thesis_index_page.html
sophiekirkham Sep 25, 2021
be1c105
Add files via upload
sophiekirkham Sep 25, 2021
566515f
Delete maps.jpg
sophiekirkham Sep 25, 2021
db04637
Add files via upload
sophiekirkham Sep 25, 2021
8d19ca7
Update other_services_page.html
sophiekirkham Sep 25, 2021
454d248
Update other_services_page.html
sophiekirkham Sep 25, 2021
a1c16e9
Update thesis_index_page.html
sophiekirkham Sep 25, 2021
2356097
Update thesis_index_page.html
sophiekirkham Sep 25, 2021
302afce
Update thesis_search.html
sophiekirkham Sep 25, 2021
7d84fe7
Update thesis_index_page.html
sophiekirkham Sep 26, 2021
a804b3c
Update thesis_index_page.html
sophiekirkham Sep 26, 2021
b24ca01
Update thesis_index_page.html
sophiekirkham Sep 26, 2021
769d453
Update thesis_search.html
sophiekirkham Sep 27, 2021
5042f7b
Update thesis_search.html
sophiekirkham Sep 27, 2021
5f8faa2
Update thesis_search.html
sophiekirkham Sep 27, 2021
39ad654
Add files via upload
sophiekirkham Sep 28, 2021
edb42ef
Update thesis_choose_help_page.html
sophiekirkham Sep 28, 2021
9e63d5b
Update thesis_choose_help_page.html
sophiekirkham Sep 28, 2021
744e891
Update thesis_choose_help_page.html
sophiekirkham Sep 28, 2021
2c74b48
Update thesis_index_page.html
sophiekirkham Sep 28, 2021
4cea040
Update thesis_index_page.html
sophiekirkham Sep 28, 2021
c8a3137
Update thesis_choose_help_page.html
sophiekirkham Sep 28, 2021
1799149
Update thesis_index_page.html
sophiekirkham Sep 28, 2021
00c876d
Update thesis_finished_page.html
sophiekirkham Sep 28, 2021
c1b8bd4
Update thesis_finished_page.html
sophiekirkham Sep 28, 2021
496dac0
Update thesis_finished_page.html
sophiekirkham Sep 28, 2021
e03b81f
Update thesis_finished_page.html
sophiekirkham Sep 28, 2021
1de9517
Update thesis_index_page.html
sophiekirkham Oct 15, 2021
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
20 changes: 20 additions & 0 deletions website/theses/static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@ h1, h2, h3, h4, h5,
color: white;
}

.bg-white {
background-color: #ffffff00;
}

.bg-white h1,
.bg-white h2,
.bg-white h3,
.bg-white h4,
.bg-white h5 {
color: #070259;
}

.tag {
background-color: rgb(249, 229, 209);
padding-top: 0.2em;
Expand Down Expand Up @@ -58,6 +70,14 @@ h1, h2, h3, h4, h5,
background-color: #E5E4E4;
}

.special-card {
background-color:#070259;
}

.new-card {
background-color:#06025900;
}

.card-finished .card-footer {
background-color: #070259;
}
Expand Down
Binary file added website/theses/static/img/finished-theses.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 website/theses/static/img/globe.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 website/theses/static/img/key-ideas.jpg
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 website/theses/static/img/maps.jpg
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 website/theses/static/img/opportunities.jpg
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 website/theses/static/img/research-topics.jpg
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 website/theses/static/img/supervisors.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
55 changes: 55 additions & 0 deletions website/theses/templates/theses/key_ideas.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{% extends "theses/theses_base.html" %}

{% load static %}
{% load wagtailcore_tags %}
{% load wagtailuserbar %}
{% load wagtailimages_tags %}

{% block body_class %}template-keyideas{% endblock %}

{% block content %}
<main class="hero" style="background-image: url({% static "img/maps.jpg" %});">
<div class="jumbotron">
<div class="container">
<div class="row">
<div class="col-lg-8 mr-auto">
<h1 class="text-white mb-4">
<span class="d-inline-block">Read about the key ideas that inform our work.</span>
</h1>
</div>
</div>
</div>
</div>
</main>

<style>
.table-outline {
outline-style: solid;
outline-color: rgb(204, 204, 204);
outline-width: 2px;
}
</style>

<div class="container py-4">
<div class="row">
<div class="col-md-8 offset-md-2">
{% include_block page.outline_title %}
<table class="table table-responsive table-outline mt-3 mb-2" role="grid">

<tbody class=".table-hover .table-striped">

<tr class="row-2" role="row">
<td>
<div class="panel clearfix">
<h4 class="no_toc mt-1">Content</h4>
{% include_block outline %}
</div>
</td>
</tr>
</table>

{% include_block page.body %}
</div>
</div>
</div>
{% endblock %}
2 changes: 1 addition & 1 deletion website/theses/templates/theses/other_services_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{% load menu_tags %}

{% block content %}
<main class="hero" style="background-image: url({% static "img/placing-red-push-pins-into-city-street-map.jpg" %});">
<main class="hero" style="background-image: url({% static "img/maps.jpg" %});">
<div class="jumbotron">
<div class="container">
<div class="row">
Expand Down
32 changes: 23 additions & 9 deletions website/theses/templates/theses/thesis_choose_help_page.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,34 @@
{% extends "theses/theses_base.html" %}
{% load static %}

{% load wagtailcore_tags %}
{% load wagtailuserbar %}
{% load wagtailimages_tags %}

{% load menu_tags %}

{% block body_class %}template-thesisindex{% endblock %}

{% block content %}
<div class="container my-3">
<div class="row">
<div class="col text-center">
<h1 class="mb-4">What do you want to focus on with your thesis?</h1>

<main class="hero" style="background-image: url({% static "img/globe.jpg" %});">
<div class="jumbotron">
<div class="container">
<div class="row">
<div class="col-lg-8 mr-auto">
<h1 class="text-white mb-4">
<span class="d-inline-block">Read more about the key ideas</span>
<span class="d-inline-block">that inform our work.</span>
</h1>
</div>
</div>
</div>
</div>
</main>

<div class="row">
</div>

<div class="container my-3">
<div class="row mb-4">
<div class="col-md-12 text-center">
<ul class="nav nav-pills center-pills" role="tablist">
Expand All @@ -32,7 +46,7 @@ <h1 class="mb-4">What do you want to focus on with your thesis?</h1>
data-target="#impact-page"
href="#impact"
role="tab">
Highest social impact
Principles our work is based on
</a>
</li>

Expand All @@ -44,7 +58,7 @@ <h1 class="mb-4">What do you want to focus on with your thesis?</h1>
data-target="#career-page"
href="#career"
role="tab">
Improving career prospects
Choosing your research focus
</a>
</li>

Expand All @@ -56,7 +70,7 @@ <h1 class="mb-4">What do you want to focus on with your thesis?</h1>
data-target="#research-page"
href="#research"
role="tab">
Research career in academia
What to do next
</a>
</li>
</ul>
Expand Down Expand Up @@ -98,4 +112,4 @@ <h1 class="mb-4">What do you want to focus on with your thesis?</h1>
}
}
</script>
{% endblock %}
{% endblock %}
1 change: 1 addition & 0 deletions website/theses/templates/theses/thesis_finished_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
{% load static %}

{% block content %}

<div class="container mt-5">
<div class="row">
<div class="col-md-3">
Expand Down
Loading