aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Dybiec <pawel.to.malpa@gmail.com>2019-12-31 01:33:27 +0100
committerPaweł Dybiec <pawel.to.malpa@gmail.com>2019-12-31 01:33:27 +0100
commitcaef9bd707ea2f69275c70a1f187962196a76c5d (patch)
tree2e81a333f7dc477939c9e8b6d3f9bc6a0dc5ca2d
parent32c61f9768a5dcb748bed96538aec26465e5454e (diff)
My css + removed some template stuff
-rw-r--r--about.md16
-rw-r--r--contact.md6
-rw-r--r--css/base.css120
-rw-r--r--css/base.css~210
-rw-r--r--css/default.css104
-rw-r--r--images/haskell-logo.pngbin5674 -> 0 bytes
-rw-r--r--images/profile.jpgbin0 -> 88921 bytes
-rw-r--r--index.html12
-rw-r--r--site.hs19
-rw-r--r--stack.yaml72
-rw-r--r--templates/default.html71
11 files changed, 389 insertions, 241 deletions
diff --git a/about.md b/about.md
index 99af9e2..712273a 100644
--- a/about.md
+++ b/about.md
@@ -1,17 +1,5 @@
---
title: About
---
-Nullam imperdiet sodales orci vitae molestie. Nunc quam orci, pharetra a
-rhoncus vitae, eleifend id felis. Suspendisse potenti. Etiam vitae urna orci.
-Quisque pellentesque dignissim felis, egestas tempus urna luctus vitae. In hac
-habitasse platea dictumst. Morbi fringilla mattis odio, et mattis tellus
-accumsan vitae.
-
-1. Amamus Unicode 碁
-2. Interdum nex magna.
-
-Vivamus eget mauris sit amet nulla laoreet lobortis. Nulla in diam elementum
-risus convallis commodo. Cras vehicula varius dui vitae facilisis. Proin
-elementum libero eget leo aliquet quis euismod orci vestibulum. Duis rhoncus
-lorem consequat tellus vestibulum aliquam. Quisque orci orci, malesuada porta
-blandit et, interdum nec magna.
+## Who I am
+My name is Paweł Dybiec
diff --git a/contact.md b/contact.md
deleted file mode 100644
index 78e8698..0000000
--- a/contact.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-title: Contact
----
-
-I live in a small hut in the mountains of Kumano Kodō on Kii Hantō and would not
-like to be contacted.
diff --git a/css/base.css b/css/base.css
new file mode 100644
index 0000000..2143bb7
--- /dev/null
+++ b/css/base.css
@@ -0,0 +1,120 @@
+body, html {
+ width: 100%;
+ height: 100%;
+}
+html {
+ min-height:100%;
+ position:relative
+ background-color: #fff;
+ font-size: 16px;
+ font-family: sans-serif;
+ line-height: 24px;
+}
+body {
+ color: #333;
+ font-size:16px;
+ margin:0px;
+ padding: 0;
+}
+h1, h2, h3 {
+ margin: 0px 0px 18px 0px;
+ padding: 24px 0px 0px 0px;
+}
+
+p, ul {
+ margin: 18px 0px 18px 0px;
+}
+
+img {
+ margin: 12px 0px 12px 0px;
+ max-width: 100%;
+}
+
+ul {
+ padding-left: 18px;
+}
+
+a {
+ color: #111;
+ text-decoration: none;
+}
+
+h1, h2, h3 {
+ font-weight: normal;
+}
+
+h1 {
+ font-size: 26px;
+}
+
+h2 {
+ font-size: 22px;
+}
+
+h3 {
+ font-size: 18px;
+}
+@media screen and (min-width: 768px) {
+ aside {
+ width: 20%;
+ height: 100%;
+ position: fixed;
+ top:0;
+ left:0;
+
+ }
+ main {
+ width: 80%;
+ position: absolute;
+ top: 0;
+ left: 20%;
+ }
+}
+aside h1, aside h2, aside h3{
+ margin: 0px 0px 8px 0px;
+ padding: 8px 0px 0px 0px;
+}
+aside ul {
+ padding-left: 0px;
+ margin: 8px 0px 8px 0px;
+}
+aside {
+ background-color: #333333;
+ color: #ffffff;
+ text-align: center;
+}
+aside a{
+ color: #eeeeee;
+}
+aside div{
+ padding-bottom: 1em;
+}
+aside div img{
+ border-radius: 50%;
+ max-width: 120px;
+}
+aside div nav ul li{
+ display: block;
+ text-transform: lowercase;
+}
+
+footer {
+ color:#999999;
+ font-size:12px;
+ text-align:center;
+ height:4em;
+ width:100%;
+ padding-top:1.2em;
+ font-family:sans-serif
+ bottom: 0;
+}
+footer a{
+ color: #111111;
+ font-weight: bold;
+}
+div#content {
+ padding-left: 4%;
+}
+main a{
+ border-bottom: 1px solid #555;
+}
diff --git a/css/base.css~ b/css/base.css~
new file mode 100644
index 0000000..94f8f58
--- /dev/null
+++ b/css/base.css~
@@ -0,0 +1,210 @@
+h1, h2, h3 {
+ margin: 0px 0px 18px 0px;
+ padding: 24px 0px 0px 0px;
+}
+
+p, ul {
+ margin: 18px 0px 18px 0px;
+}
+
+img {
+ margin: 12px 0px 12px 0px;
+ max-width: 100%;
+}
+
+ul {
+ padding-left: 18px;
+}
+
+div#footer {
+ margin: 60px 0px 36px 0px;
+}
+
+html {
+ background-color: #fff;
+ font-size: 16px;
+ font-family: sans-serif;
+ line-height: 24px;
+}
+
+body {
+ color: #333;
+}
+
+a {
+ color: #111;
+ text-decoration: none;
+ border-bottom: 1px solid #555;
+}
+
+/* Pandoc 2 puts 'a' elements inside code blocks for linking to lines. We don't
+ * want to underline those. */
+code a {
+ border-bottom: none;
+}
+
+div.figure a{
+ border: none;
+}
+
+@media all and (min-width: 620px) {
+ div.flickr img {
+ border: 1px solid #888;
+ padding: 6px;
+ }
+}
+
+div.flickr {
+ margin-top: 60px;
+ margin-bottom: 60px;
+}
+
+a img {
+ margin-bottom: 0px;
+}
+
+pre {
+ margin-left: 18px;
+ overflow: auto;
+}
+
+pre code {
+ background-color: transparent;
+ color: #333;
+ font-size: 14px;
+ margin: 0px;
+ padding: 0px;
+}
+
+code {
+ color: #408090;
+}
+
+h1, h2, h3 {
+ font-weight: normal;
+}
+
+h1 {
+ font-size: 26px;
+}
+
+h2 {
+ font-size: 22px;
+}
+
+h3 {
+ font-size: 18px;
+}
+
+
+blockquote {
+ background: #e6e6e6 url("../images/quote-background.png") no-repeat left top;
+ font-style: italic;
+ margin-left: 18px;
+ padding: 6px 6px 6px 54px;
+}
+
+hr {
+ border: none;
+ margin: 36px auto 36px auto;
+ text-align: center;
+}
+
+hr:after {
+ content: "\002217 \002217 \002217";
+}
+
+span.soft, figcaption {
+ font-style: italic;
+ color: #555;
+}
+
+div.figure {
+ text-align: center;
+}
+
+div.figure p {
+ margin-top: 6px;
+}
+
+Au.footnote-ref {
+ border: none;
+}
+
+a.footnote-ref sup:before {
+ content: "(";
+}
+
+a.footnote-ref sup:after {
+ content: ")";
+}
+
+a.footnote-ref sup {
+ padding: 2px;
+}
+
+a.footnote-back {
+ border: none;
+ padding: 0px 6px 0px 6px;
+}
+
+section.footnotes:before {
+ content: "Footnotes";
+ font-size: 18px;
+ padding-left: 18px;
+}
+
+section.footnotes {
+ border-left: 1px dashed #555;
+ color: #555;
+ margin-top: 36px;
+}
+
+section.footnotes hr {
+ display: none;
+}
+
+div.photoblog img {
+ margin-top: 48px;
+ margin-bottom: 48px;
+}
+
+div.photoblog div.pagination {
+ font-size: 14px;
+ padding: 12px 0px;
+}
+
+div#footer {
+ font-size: 14px;
+}
+
+footer {
+ color:#999999;
+ font-size:12px;
+ text-align:center;
+ height:4em;
+ background-color:#323232;
+ position:absolute;
+ bottom:0;
+ width:100%;
+ overflow:hidden;
+ padding-top:1em;
+ font-family:sans-serif
+}
+footer a{
+ color: #fff;
+ font-weight: bold;
+}
+
+/*******************************************************************************
+ * Disqus *
+ ******************************************************************************/
+
+/* Reset list image for disqus */
+div#disqus_thread ul {
+ list-style-image: none;
+}
+
+div#dsq-subscribe em {
+ text-decoration: none;
+}
diff --git a/css/default.css b/css/default.css
deleted file mode 100644
index d61b8af..0000000
--- a/css/default.css
+++ /dev/null
@@ -1,104 +0,0 @@
-
-html {
- /* to allow the #footer to be properly positioned
- at the bottom, even when #content is longer than
- the viewport high */
- min-height: 100%;
- position: relative;
-}
-
-body {
- color: black;
- font-size: 16px;
- margin: 0px;
-}
-
-header {
- margin-bottom: 0px;
- padding: 50px;
- background: linear-gradient(to right,#19111f 0%,#2c1e37 100%);
-}
-
-div.logo a {
- color: #FFFFFF;
- float: left;
- font-family: sans-serif;
- font-size: 28px;
- font-weight: bold;
- text-decoration: none;
-}
-
-header nav {
- text-align: right;
-}
-
-header nav a {
- color: #d1cddc!important;
- font-family: sans-serif;
- font-size: 14px;
- font-weight: bold;
- margin-left: 12px;
- text-decoration: none;
- text-transform: uppercase;
-}
-
-header nav a:hover{
- color: #FFFFFF;
-}
-
-main {
- margin-left: 50px;
- margin-right: 50px;
- margin-bottom: 5.5rem; /* footer-height + 1.5rem */
-}
-
-main h1{
- color: #6e618d;
- font-size: 25px;
- font-family: sans-serif;
-}
-
-main h2{
- color: #6e618d;
- font-size: 20px;
- font-family: sans-serif;
-}
-
-main, /* this line for archives page */
-main p{
- color: #333333;
- font-family: sans-serif;
- font-size: 15px;
-}
-
-main a{
- color: #428bca;
- text-decoration: none;
-}
-
-footer {
- color: #999999;
- font-size: 12px;
- text-align: center;
- height: 4em;
- background-color: #323232;
- position: absolute;
- bottom: 0;
- width: 100%;
- overflow: hidden;
- padding-top: 1em;
- font-family: sans-serif;
-}
-
-footer a {
- color: #ffffff;
- font-weight: bold;
- text-decoration: none;
-}
-
-section.header {
- color: #555;
- font-size: 14px;
- font-style: italic;
-}
-
diff --git a/images/haskell-logo.png b/images/haskell-logo.png
deleted file mode 100644
index 97c0937..0000000
--- a/images/haskell-logo.png
+++ /dev/null
Binary files differ
diff --git a/images/profile.jpg b/images/profile.jpg
new file mode 100644
index 0000000..2f8ac0b
--- /dev/null
+++ b/images/profile.jpg
Binary files differ
diff --git a/index.html b/index.html
index 6dd191d..f9d6e50 100644
--- a/index.html
+++ b/index.html
@@ -1,16 +1,10 @@
---
title: Home
---
+<article>
<h2>Welcome</h2>
-<img src="/images/haskell-logo.png" style="float: right; margin: 10px;" />
+<p>Welcome to my website!</p>
-<p>Welcome to my blog!</p>
-
-<p>I've reproduced a list of recent posts here for your reading pleasure:</p>
-
-<h2>Posts</h2>
-$partial("templates/post-list.html")$
-
-<p>…or you can find more in the <a href="/archive.html">archives</a>.</p>
+</article>
diff --git a/site.hs b/site.hs
index 210245c..b6c2724 100644
--- a/site.hs
+++ b/site.hs
@@ -11,15 +11,22 @@ main = hakyll $ do
route idRoute
compile copyFileCompiler
- match "css/*" $ do
+ {- match "css/*" $ do
route idRoute
- compile compressCssCompiler
-
- match (fromList ["about.md", "contact.md"]) $ do
+ compile compressCssCompiler -}
+ match "css/*" $ compile compressCssCompiler
+ create ["style.css"] $ do
+ route idRoute
+ compile $ do
+ csses <- loadAll "css/*.css"
+ makeItem $ unlines $ map itemBody csses
+
+ match (fromList ["about.md"]) $ do
route $ setExtension "html"
compile $ pandocCompiler
>>= loadAndApplyTemplate "templates/default.html" defaultContext
>>= relativizeUrls
+
match "posts/*" $ do
route $ setExtension "html"
@@ -46,9 +53,9 @@ main = hakyll $ do
match "index.html" $ do
route idRoute
compile $ do
- posts <- recentFirst =<< loadAll "posts/*"
+ --posts <- recentFirst =<< loadAll "posts/*"
let indexCtx =
- listField "posts" postCtx (return posts) `mappend`
+ --listField "posts" postCtx (return posts) `mappend`
constField "title" "Home" `mappend`
defaultContext
diff --git a/stack.yaml b/stack.yaml
index 5cd82c4..1aa2df1 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,77 +1,5 @@
-# This file was automatically generated by 'stack init'
-#
-# Some commonly used options have been documented as comments in this file.
-# For advanced use and comprehensive documentation of the format, please see:
-# https://docs.haskellstack.org/en/stable/yaml_configuration/
-
-# A warning or info to be displayed to the user on config load.
-user-message: |
- Warning (added by new or init): Some packages were found to be incompatible with the resolver and have been left commented out in the packages section.
- You can omit this message by removing it from stack.yaml
-
-# Resolver to choose a 'specific' stackage snapshot or a compiler version.
-# A snapshot resolver dictates the compiler version and the set of packages
-# to be used for project dependencies. For example:
-#
-# resolver: lts-3.5
-# resolver: nightly-2015-09-21
-# resolver: ghc-7.10.2
-#
-# The location of a snapshot can be provided as a file or url. Stack assumes
-# a snapshot provided as a file might change, whereas a url resource does not.
-#
-# resolver: ./custom-snapshot.yaml
-# resolver: https://example.com/snapshots/2018-01-01.yaml
resolver: lts-14.14
-
-# User packages to be built.
-# Various formats can be used as shown in the example below.
-#
-# packages:
-# - some-directory
-# - https://example.com/foo/bar/baz-0.0.2.tar.gz
-# subdirs:
-# - auto-update
-# - wai
packages:
- .
-# The following packages have been ignored due to incompatibility with the
-# resolver compiler, dependency conflicts with other packages
-# or unsatisfied dependencies.
-#- .
-
-# Dependency packages to be pulled from upstream that are not in the resolver.
-# These entries can reference officially published versions as well as
-# forks / in-progress versions pinned to a git hash. For example:
-#
-# extra-deps:
-# - acme-missiles-0.3
-# - git: https://github.com/commercialhaskell/stack.git
-# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
-#
extra-deps:
- hakyll-4.13.0.1
-
-# Override default flag values for local packages and extra-deps
-# flags: {}
-
-# Extra package databases containing global packages
-# extra-package-dbs: []
-
-# Control whether we use the GHC we find on the path
-# system-ghc: true
-#
-# Require a specific version of stack, using version ranges
-# require-stack-version: -any # Default
-# require-stack-version: ">=2.1"
-#
-# Override the architecture used by stack, especially useful on Windows
-# arch: i386
-# arch: x86_64
-#
-# Extra directories used by stack for building
-# extra-include-dirs: [/path/to/dir]
-# extra-lib-dirs: [/path/to/dir]
-#
-# Allow a newer minor version of GHC than the snapshot specifies
-# compiler-check: newer-minor
diff --git a/templates/default.html b/templates/default.html
index e91badc..979de47 100644
--- a/templates/default.html
+++ b/templates/default.html
@@ -1,33 +1,44 @@
<!doctype html>
<html lang="en">
- <head>
- <meta charset="utf-8">
- <meta http-equiv="x-ua-compatible" content="ie=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1">
- <title>My Hakyll Blog - $title$</title>
- <link rel="stylesheet" href="/css/default.css" />
- </head>
- <body>
- <header>
- <div class="logo">
- <a href="/">My Hakyll Blog</a>
- </div>
- <nav>
- <a href="/">Home</a>
- <a href="/about.html">About</a>
- <a href="/contact.html">Contact</a>
- <a href="/archive.html">Archive</a>
- </nav>
- </header>
-
- <main role="main">
- <h1>$title$</h1>
- $body$
- </main>
-
- <footer>
- Site proudly generated by
- <a href="http://jaspervdj.be/hakyll">Hakyll</a>
- </footer>
- </body>
+ <head>
+ <meta charset="utf-8">
+ <meta http-equiv="x-ua-compatible" content="ie=edge">
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <title>dyniec - $title$</title>
+ <link rel="stylesheet" href="/style.css" />
+ </head>
+ <body>
+ <aside>
+ <div>
+ <a href="/">
+ <img src="/images/profile.jpg" alt="dyniec's website" title="dyniec's website">
+ </a>
+
+ <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>
+ </ul>
+ </nav>
+
+ </div>
+ </aside>
+ <main>
+ <div id="content">
+ <h1>$title$</h1>
+ $body$
+
+ </div>
+ <footer>
+ Site proudly generated by
+ <a href="http://jaspervdj.be/hakyll">Hakyll</a>
+ </footer>
+ </main>
+ </body>
</html>