From e1102d887f01222cf84d97313ff297b3e83fce9f Mon Sep 17 00:00:00 2001 From: Suguivy Date: Sun, 28 Feb 2021 23:59:06 +0100 Subject: [PATCH] Added fonts and changed css a bit --- css/default.css | 15 +++++++++++++-- css/highlighting.css | 6 +++--- site.hs | 6 +++++- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/css/default.css b/css/default.css index 381ff73..900c61e 100644 --- a/css/default.css +++ b/css/default.css @@ -1,14 +1,24 @@ +@font-face { + font-family: FiraSans; + src: url('../fonts/FiraSans-Regular.ttf'); +} + +@font-face { + font-family: Iosevka; + src: url('../fonts/iosevka-regular.ttf'); +} + html { - font-size: 62.5%; + font-size: 75.5%; } body { + font-family: FiraSans, sans; font-size: 1.6rem; color: #000; } header { - border-bottom: 0.2rem solid #000; } nav { @@ -116,6 +126,7 @@ article .header { padding: 0; } header { + width: 60rem; margin: 0 0 3rem; padding: 1.2rem 0; } diff --git a/css/highlighting.css b/css/highlighting.css index cee8875..7a74be4 100644 --- a/css/highlighting.css +++ b/css/highlighting.css @@ -1,10 +1,10 @@ a.sourceLine { display: inline-block; line-height: 1.25; } a.sourceLine { pointer-events: none; color: inherit; text-decoration: inherit; } a.sourceLine:empty { height: 1.2em; } -.sourceCode { overflow: visible; } +.sourceCode { overflow: visible; border-radius: 8px; font-family: Iosevka; font-variant-ligatures: none;} code.sourceCode { white-space: pre; position: relative; } -div.sourceCode { margin: 1em 0; } -pre.sourceCode { margin: 0; } +div.sourceCode { margin: 1em 0; border-style: solid; border-width: 3px; } +pre.sourceCode { margin: 15px; } @media screen { div.sourceCode { overflow: auto; } } diff --git a/site.hs b/site.hs index d4262be..2d86dfb 100644 --- a/site.hs +++ b/site.hs @@ -6,7 +6,7 @@ import Hakyll -------------------------------------------------------------------------------- config :: Configuration config = defaultConfiguration - { deployCommand = "scp -r _site/* mononobe:/var/www/nei.su" + { deployCommand = "rsync -a _site/ mononobe:/var/www/nei.su" } @@ -17,6 +17,10 @@ main = hakyllWith config $ do route idRoute compile copyFileCompiler + match "fonts/*" $ do + route idRoute + compile copyFileCompiler + match "css/*" $ do route idRoute compile compressCssCompiler