diff options
author | Jakob Odersky <jakob@odersky.com> | 2018-11-16 15:34:49 -0800 |
---|---|---|
committer | Jakob Odersky <jakob@odersky.com> | 2018-11-16 15:36:36 -0800 |
commit | 14da66191f12755de633fe839aadd6bb2f09fd57 (patch) | |
tree | 44109e3f730c4c13e92d8d563ef586d1c3564e85 | |
parent | adf0a539034a167f86200c19eec36c42f0a3e01d (diff) | |
parent | e6f81b52b272776ce78963575740845c8bd5eddc (diff) | |
download | website-14da66191f12755de633fe839aadd6bb2f09fd57.tar.gz website-14da66191f12755de633fe839aadd6bb2f09fd57.tar.bz2 website-14da66191f12755de633fe839aadd6bb2f09fd57.zip |
Merge branch 'master' of github.com:jodersky/jodersky.github.io
-rw-r--r-- | 404.html | 3 | ||||
-rw-r--r-- | _config.yml | 2 | ||||
-rw-r--r-- | _includes/header.html | 3 | ||||
-rw-r--r-- | assets/cv.pdf | bin | 139332 -> 154565 bytes | |||
-rw-r--r-- | index.html | 2 |
5 files changed, 7 insertions, 3 deletions
@@ -1,8 +1,9 @@ --- layout: empty title: 404 - Not Found +permalink: /404.html --- <div class="text-center"> <h1>404</h1> <p>The requested page does not exist. Return to <a href="/">main site</a>.</p> -<div>
\ No newline at end of file +<div> diff --git a/_config.yml b/_config.yml index 7ffa80d..f63ca86 100644 --- a/_config.yml +++ b/_config.yml @@ -3,4 +3,4 @@ collections: output: false # posts -permalink: /blog/:year/:month/:day/:title/
\ No newline at end of file +permalink: /blog/:year/:month/:day/:title/ diff --git a/_includes/header.html b/_includes/header.html index d8fbecd..4e2243e 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -15,6 +15,9 @@ <li class="nav-item{% if page.id == "projects" %} active{% endif %}"> <a class="nav-link" href="/projects/">Projects</a> </li> + <li class="nav-item{% if page.id == "talks" %} active{% endif %}"> + <a class="nav-link" href="/talks/">Talks</a> + </li> <!--<li class="nav-item{% if page.id == "blog" %} active{% endif %}"> <a class="nav-link" href="/blog">Blog</a> </li>--> diff --git a/assets/cv.pdf b/assets/cv.pdf Binary files differindex d7d6f17..14d5154 100644 --- a/assets/cv.pdf +++ b/assets/cv.pdf @@ -12,6 +12,6 @@ id: about <p>I'm Jakob Odersky.</p> <p>I'm building a treatment access platform for cancer patients at <a href="https://driver.xyz/">Driver</a>. In my free time I like working on various technology-related <a href="/projects/">projects</a>.</p> <p>The best way to contact me is by email, [first name]@[last name].com. I'm also active on <a href="https://www.github.com/jodersky">GitHub</a> and occasionally on <a href="https://twitter.com/jodersky">Twitter</a> and <a href="https://www.linkedin.com/in/jodersky">LinkedIn</a>.</p> - <!--<p><i class="fa fa-hand-o-right"></i> <a href="/assets/cv.pdf">Resume</a></p>--> + <p><i class="fa fa-hand-o-right"></i> <a href="/assets/cv.pdf">Resume</a></p> </div> </div> |