aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Odersky <jodersky@gmail.com>2015-07-01 16:50:28 +0200
committerJakob Odersky <jodersky@gmail.com>2015-07-01 16:50:28 +0200
commitfe0f985cc397d088eb2c5dee81f5ab4be573658d (patch)
treed2c99678bbb5152cd29ed6001be3ebb473360f2d
parente8d3bb74c8ff551bd941da253438fef17424cb36 (diff)
downloadwebsite-fe0f985cc397d088eb2c5dee81f5ab4be573658d.tar.gz
website-fe0f985cc397d088eb2c5dee81f5ab4be573658d.tar.bz2
website-fe0f985cc397d088eb2c5dee81f5ab4be573658d.zip
update site
-rw-r--r--_includes/header.html4
-rw-r--r--_includes/main.html7
-rw-r--r--_projects/2010-sims.md6
-rw-r--r--_projects/2014-condor.md2
-rw-r--r--assets/cv.pdfbin0 -> 139640 bytes
-rw-r--r--assets/images/jo.pngbin0 -> 7990 bytes
-rw-r--r--assets/images/jo.svg62
-rw-r--r--index.html5
-rw-r--r--projects/index.html16
9 files changed, 87 insertions, 15 deletions
diff --git a/_includes/header.html b/_includes/header.html
index f2bec93..868404d 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -14,7 +14,7 @@
<div class="collapse navbar-collapse" id="main-navbar-collapse">
<ul class="nav navbar-nav">
<li {% if page.id == "about" %} class="active" {% endif %}>
- <a href="/">About</a>
+ <a href="/">About Me</a>
</li>
<li {% if page.id == "projects" %} class="active" {% endif %}>
<a href="/projects">Projects</a>
@@ -48,4 +48,4 @@
{{ content }}
</div>
{% endcapture %}
-{% include main.html %} \ No newline at end of file
+{% include main.html %}
diff --git a/_includes/main.html b/_includes/main.html
index ece6414..d0d8879 100644
--- a/_includes/main.html
+++ b/_includes/main.html
@@ -6,17 +6,20 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="shortcut icon" type="image/png" href="/assets/images/jo.png"/>
+
<title>{{ page.title }}</title>
<link rel="stylesheet" href="/assets/lib/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" href="/assets/lib/fontawesome/css/font-awesome.min.css">
+ <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+
</head>
<body>
{{ content }}
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
<script src="/assets/lib/bootstrap/js/bootstrap.min.js"></script>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/_projects/2010-sims.md b/_projects/2010-sims.md
new file mode 100644
index 0000000..639a010
--- /dev/null
+++ b/_projects/2010-sims.md
@@ -0,0 +1,6 @@
+---
+title: A Simple Mechanics Simulator (SiMS)
+site: https://github.com/jodersky/sims
+description: A real-time mechanics simulator, my final year school project.
+year: 2010
+---
diff --git a/_projects/2014-condor.md b/_projects/2014-condor.md
index 45b1b3c..15a7f16 100644
--- a/_projects/2014-condor.md
+++ b/_projects/2014-condor.md
@@ -2,5 +2,5 @@
title: Project Condor
site: https://project-condor.github.io
description: Suite of projects related to engineering and navigating a quadrotor.
-year: 2014
+year: 2014-2015
---
diff --git a/assets/cv.pdf b/assets/cv.pdf
new file mode 100644
index 0000000..2f9be82
--- /dev/null
+++ b/assets/cv.pdf
Binary files differ
diff --git a/assets/images/jo.png b/assets/images/jo.png
new file mode 100644
index 0000000..f365170
--- /dev/null
+++ b/assets/images/jo.png
Binary files differ
diff --git a/assets/images/jo.svg b/assets/images/jo.svg
new file mode 100644
index 0000000..0c9a0e8
--- /dev/null
+++ b/assets/images/jo.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="256"
+ height="256"
+ id="svg2987"
+ version="1.1"
+ inkscape:version="0.48.5 r10040"
+ sodipodi:docname="New document 1">
+ <defs
+ id="defs3" />
+ <sodipodi:namedview
+ inkscape:document-units="mm"
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.979899"
+ inkscape:cx="235.30052"
+ inkscape:cy="123.34638"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ units="px"
+ inkscape:window-width="1920"
+ inkscape:window-height="1033"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata4">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(0,-796.36218)">
+ <path
+ inkscape:connector-curvature="0"
+ style="fill:#000000;fill-opacity:1;stroke:none"
+ d="m 2.855136,809.1886 0,30.28511 80.56582,0 c 16.270968,-16.23126 37.239494,-26.7189 60.305024,-28.69395 l 0,-0.37127 -0.2652,0 0,-1.21989 -140.605644,0 z m 140.870844,1.59116 0,30.55031 c 2.59893,-0.30338 5.23235,-0.47735 7.90278,-0.47735 41.53905,0 75.20889,37.61151 75.20889,84.06637 0,46.45488 -33.66984,84.17241 -75.20889,84.17241 -6.53065,0 -12.83822,-0.9544 -18.8818,-2.7049 -5.89258,9.3481 -13.87503,17.2433 -23.33704,22.9657 12.88017,6.5282 27.1617,10.1835 42.21884,10.1835 56.57631,0 102.41776,-51.34502 102.41776,-114.61671 0,-63.27166 -45.84145,-114.5106 -102.41776,-114.5106 -2.66996,0 -5.28412,0.14698 -7.90278,0.37127 z m -34.31606,218.57254 c -12.471106,-6.3207 -23.625524,-15.3418 -32.83096,-26.4133 -1.232331,0.1326 -2.49825,0.2122 -3.765749,0.2122 -18.485651,0 -33.551126,-14.47053 -34.475171,-32.72488 l -36.3845633,0 c 0.956921,38.33428 32.2946593,69.10948 70.8597343,69.10948 13.402231,0 25.913868,-3.7227 36.596709,-10.1835 z M 76.57896,1002.939 c 10.447813,-1.1243 19.437715,-6.9122 24.98124,-15.22205 -15.456284,-15.41131 -25.193396,-37.83417 -25.193396,-62.79786 0,-27.94549 12.207189,-52.65512 30.974616,-67.9426 l 0,-17.50278 -23.920464,0 c -21.02557,20.97425 -34.263017,51.45986 -34.263017,85.44538 0,30.12847 10.410374,57.56129 27.421021,78.01991 z m 30.76246,-145.96251 0,113.44983 c -0.32461,6.39113 -2.44248,12.28579 -5.78122,17.29063 8.78431,8.75875 19.44656,15.26905 31.18676,18.66965 6.39308,-10.14217 10.33681,-21.99356 10.87294,-34.74038 l 0.10607,0 0,-130.31615 c -13.50873,1.57686 -25.95983,7.15468 -36.38456,15.64642 z"
+ id="path2989" />
+ </g>
+</svg>
diff --git a/index.html b/index.html
index 1367b10..1bbcd3a 100644
--- a/index.html
+++ b/index.html
@@ -11,7 +11,8 @@ id: about
<div class="col-sm-9">
<h2>Hi,</h2>
<p>I'm Jakob Odersky.</p>
- <p>I am currently studying physics and computer science at EPFL. In my free time I like working on various technology-related projects.</p>
- <p>The best way to contact me is by email. I'm also active on GitHub. (Use the above icon links)</p>
+ <p>I studied physics and computer science at EPFL. 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 <a href="http://www.google.com/recaptcha/mailhide/d?k=01HL3HYaIAlqG65738Sa5o5g==&amp;c=Mhki0TZUvIR7t-3P1GlaVymx4LW_kxdovpzP9I4A8kU=" onclick="window.open('http://www.google.com/recaptcha/mailhide/d?k\07501HL3HYaIAlqG65738Sa5o5g\75\75\46c\75Mhki0TZUvIR7t-3P1GlaVymx4LW_kxdovpzP9I4A8kU\075', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;">email</a>. I'm also active on <a href="https://www.github.com/jodersky">GitHub</a>.</p>
+ <p><i class="fa fa-hand-o-right"></i> <a href="/assets/cv.pdf">Resume</a></p>
</div>
</div>
diff --git a/projects/index.html b/projects/index.html
index e2188b1..6b24744 100644
--- a/projects/index.html
+++ b/projects/index.html
@@ -4,17 +4,17 @@ title: Projects
id: projects
---
I believe in the merits of building software in the open and its free usage. Here is a list of side projects I've been working on.
-<h2>Active Projects</h2>
+<h2>Polished Projects</h2>
<p>These are the projects that are more involved and presentable.</p>
<div class="list-group row">
{% for project in site.projects reversed %}
- <a class="list-group-item" href="{{ project.site }}">
- <h4>{{ project.title }} <small class="pull-right">{{project.year}}</small></h4>
- <div>
- {{ project.description }}
- </div>
- </a>
+ <a class="list-group-item" href="{{ project.site }}">
+ <h4>{{ project.title }} <small class="pull-right">{{project.year}}</small></h4>
+ <div>
+ {{ project.description }}
+ </div>
+ </a>
{% endfor %}
</div>
<h2>Other Projects</h2>
-Check out <a href="https://github.com/jodersky?tab=repositories">github repositories</a> for a complete list of all my projects, including smaller and personal ones. \ No newline at end of file
+Check out <a href="https://github.com/jodersky?tab=repositories">github repositories</a> for a complete list of all my projects, including smaller and personal ones.