about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaweł Dybiec <pawel.to.malpa@gmail.com>2019-12-31 14:09:40 +0100
committerPaweł Dybiec <pawel.to.malpa@gmail.com>2019-12-31 14:09:40 +0100
commit3e066c25b16860fcc3b2094105793c6c11d7f3e9 (patch)
tree227054567983f8460cde5f78694804ff961a307e
parentMy css + removed some template stuff (diff)
Who am I
-rw-r--r--about.md5
-rw-r--r--css/base.css4
-rw-r--r--index.html10
-rw-r--r--index.md12
-rw-r--r--site.hs15
-rw-r--r--templates/default.html3
6 files changed, 16 insertions, 33 deletions
diff --git a/about.md b/about.md
deleted file mode 100644
index 712273a..0000000
--- a/about.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: About
----
-## Who I am
-My name is Paweł Dybiec
diff --git a/css/base.css b/css/base.css
index 2143bb7..697a33d 100644
--- a/css/base.css
+++ b/css/base.css
@@ -56,7 +56,7 @@ h3 {
 }
 @media screen and (min-width: 768px) {
     aside {
-	width: 20%;
+	width: 15%;
 	height: 100%;
 	position: fixed;
 	top:0;
@@ -67,7 +67,7 @@ h3 {
 	width: 80%;
 	position: absolute;
 	top: 0;
-	left: 20%;
+	left: 15%;
     }
 }
 aside h1, aside h2, aside h3{
diff --git a/index.html b/index.html
deleted file mode 100644
index f9d6e50..0000000
--- a/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
----
-title: Home
----
-<article>
-
-<h2>Welcome</h2>
-
-<p>Welcome to my website!</p>
-
-</article>
diff --git a/index.md b/index.md
new file mode 100644
index 0000000..3230111
--- /dev/null
+++ b/index.md
@@ -0,0 +1,12 @@
+---
+title: About me
+---
+## Who I am
+Hi! My name is Paweł Dybiec.
+I was born in 1995, and spent most of my life in Wrocław, Poland.
+
+* master's student in Computer Science at [University of Wrocław](http://ii.uni.wroc.pl/)
+* team leader in [Continuum Science Club](http://continuum.uni.wroc.pl/) 2018-2019
+* organizer of [Pizza contest](https://contest.pizza/) 2018
+* functional programming enthusiast
+* operating systems enthusiast
diff --git a/site.hs b/site.hs
index b6c2724..3030101 100644
--- a/site.hs
+++ b/site.hs
@@ -21,7 +21,7 @@ main = hakyll $ do
             csses <- loadAll "css/*.css"
             makeItem $ unlines $ map itemBody csses
     
-    match (fromList ["about.md"]) $ do
+    match (fromList ["index.md"]) $ do
         route   $ setExtension "html"
         compile $ pandocCompiler
             >>= loadAndApplyTemplate "templates/default.html" defaultContext
@@ -50,19 +50,6 @@ main = hakyll $ do
                 >>= relativizeUrls
 
 
-    match "index.html" $ do
-        route idRoute
-        compile $ do
-            --posts <- recentFirst =<< loadAll "posts/*"
-            let indexCtx =
-                    --listField "posts" postCtx (return posts) `mappend`
-                    constField "title" "Home"                `mappend`
-                    defaultContext
-
-            getResourceBody
-                >>= applyAsTemplate indexCtx
-                >>= loadAndApplyTemplate "templates/default.html" indexCtx
-                >>= relativizeUrls
 
     match "templates/*" $ compile templateBodyCompiler
 
diff --git a/templates/default.html b/templates/default.html
index 979de47..7e61229 100644
--- a/templates/default.html
+++ b/templates/default.html
@@ -17,13 +17,12 @@
 	<nav>
           <h1> <a href="/">Home</a> </h1>
 	  <ul>
-	    <li> <a href="/about.html"> About me </a> </li>
 	  </ul>
 	  
 	  <h1> Links </h1>
 	  <ul>
 	    <li> <a href="https://github.com/dyniec">GitHub </a> </li>
-	    <li> <a href="https://git.dybiec.info">My git </a> </li>
+	    <li> <a href="https://git.dybiec.info/dyniec">My git </a> </li>
 	  </ul>
 	</nav>