summaryrefslogtreecommitdiff
path: root/site/public/research
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2019-03-10 18:55:54 +0100
committerJules Laplace <julescarbon@gmail.com>2019-03-10 18:55:54 +0100
commit9ab044ca26dbda9672b31e54e2ca848a21b96ce3 (patch)
treec6a31f17d20f771c0b89a13b7e0cdd32bfbc86de /site/public/research
parent0868068cda92a933d542090a3085cf4ff8944e1c (diff)
parentae7a45794ef3a6c72cf24b3223e8fd37c8fb22d9 (diff)
Merge branch 'master' of github.com:adamhrv/megapixels_dev
Diffstat (limited to 'site/public/research')
-rw-r--r--site/public/research/00_introduction/index.html1
-rw-r--r--site/public/research/01_from_1_to_100_pixels/index.html1
-rw-r--r--site/public/research/02_what_computers_can_see/index.html1
-rw-r--r--site/public/research/index.html3
4 files changed, 1 insertions, 5 deletions
diff --git a/site/public/research/00_introduction/index.html b/site/public/research/00_introduction/index.html
index b661b939..95735b5a 100644
--- a/site/public/research/00_introduction/index.html
+++ b/site/public/research/00_introduction/index.html
@@ -21,7 +21,6 @@
</a>
<div class='links'>
<a href="/datasets/">Datasets</a>
- <a href="/research/">Research</a>
<a href="/about/">About</a>
</div>
</header>
diff --git a/site/public/research/01_from_1_to_100_pixels/index.html b/site/public/research/01_from_1_to_100_pixels/index.html
index 87a08886..5254fb40 100644
--- a/site/public/research/01_from_1_to_100_pixels/index.html
+++ b/site/public/research/01_from_1_to_100_pixels/index.html
@@ -21,7 +21,6 @@
</a>
<div class='links'>
<a href="/datasets/">Datasets</a>
- <a href="/research/">Research</a>
<a href="/about/">About</a>
</div>
</header>
diff --git a/site/public/research/02_what_computers_can_see/index.html b/site/public/research/02_what_computers_can_see/index.html
index 6826955f..202359e0 100644
--- a/site/public/research/02_what_computers_can_see/index.html
+++ b/site/public/research/02_what_computers_can_see/index.html
@@ -21,7 +21,6 @@
</a>
<div class='links'>
<a href="/datasets/">Datasets</a>
- <a href="/research/">Research</a>
<a href="/about/">About</a>
</div>
</header>
diff --git a/site/public/research/index.html b/site/public/research/index.html
index e78e34c6..303732f8 100644
--- a/site/public/research/index.html
+++ b/site/public/research/index.html
@@ -21,14 +21,13 @@
</a>
<div class='links'>
<a href="/datasets/">Datasets</a>
- <a href="/research/">Research</a>
<a href="/about/">About</a>
</div>
</header>
<div class="content content-">
<section><h1>Research Blog</h1>
-</section><div class='research_index'><a href='/research/00_introduction/'><section class='wide'><img src='data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==' alt='Research post' /><section><h1>00: Introduction</h1><h2></h2></section></section></a><a href='/research/01_from_1_to_100_pixels/'><section class='wide'><img src='https://nyc3.digitaloceanspaces.com/megapixels/v1/site/research/01_from_1_to_100_pixels/assets/intro.jpg' alt='Research post' /><section><h1>From 1 to 100 Pixels</h1><h2>A breif description of this post, appears in the index page overview</h2></section></section></a></div>
+</section>
</div>
<footer>