rework website
This commit is contained in:
parent
782311c832
commit
3f2f910349
6 changed files with 69 additions and 48 deletions
|
@ -26,3 +26,4 @@ executable chaoszone
|
|||
, aeson
|
||||
hs-source-dirs: src
|
||||
default-language: Haskell2010
|
||||
ghc-options: -Wall -threaded
|
||||
|
|
|
@ -1,14 +1,20 @@
|
|||
body {
|
||||
color: black;
|
||||
font-family: 'CMUTypewriter';
|
||||
font-size: 23px;
|
||||
font-size: 23pt;
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
padding: 0 2rem 0;
|
||||
margin: 0;
|
||||
display: flex;
|
||||
display: grid;
|
||||
min-height: 100vh;
|
||||
flex-direction: column;
|
||||
grid-template-columns: [leftcol] 23rem [maincol] auto [rightcol] 1fr;
|
||||
grid-template-rows: [headerrow] 6rem [mainrow] auto [footerrow] 2rem;
|
||||
grid-template-areas:
|
||||
"logo header header"
|
||||
"logo main main"
|
||||
"logo footer footer";
|
||||
background-color: #a21d10;
|
||||
}
|
||||
|
||||
body::before {
|
||||
|
@ -19,21 +25,24 @@ body::before {
|
|||
bottom: 0;
|
||||
left: 0;
|
||||
right: 0;
|
||||
background-color: #c30000;
|
||||
background-image: linear-gradient(to bottom, rgba(195,0,0,0.9) 0%,rgba(195,0,0,0.9) 100%), url(/images/Chaoszone.black.svg);
|
||||
background-image: url(/images/Chaoszone.black.svg);
|
||||
background-size: contain;
|
||||
background-attachment:fixed;
|
||||
background-repeat:no-repeat;
|
||||
background-position: center;
|
||||
opacity: 0.05;
|
||||
}
|
||||
|
||||
header {
|
||||
border-bottom: 2px solid white;
|
||||
margin-bottom: 30px;
|
||||
padding: 12px 0px 12px 0px;
|
||||
grid-area: header;
|
||||
}
|
||||
|
||||
header, header a {
|
||||
font-family: 'CMUTypewriter';
|
||||
font-size: 30px;
|
||||
margin-left: 25rem;
|
||||
font-size: 23pt;
|
||||
}
|
||||
|
||||
h1, h2, h3, h4, h5 {
|
||||
|
@ -50,6 +59,10 @@ a:hover {
|
|||
text-decoration: underline
|
||||
}
|
||||
|
||||
#logo {
|
||||
grid-area: logo;
|
||||
}
|
||||
|
||||
#logo, #logo img {
|
||||
max-width: 23rem;
|
||||
}
|
||||
|
@ -83,7 +96,6 @@ nav li {
|
|||
|
||||
nav li a {
|
||||
color: white;
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
margin-left: 12px;
|
||||
text-decoration: none;
|
||||
|
@ -95,7 +107,7 @@ nav li a:first-child {
|
|||
}
|
||||
|
||||
article {
|
||||
margin-left: 25rem;
|
||||
grid-area: main;
|
||||
}
|
||||
|
||||
article img {
|
||||
|
@ -103,19 +115,22 @@ article img {
|
|||
}
|
||||
|
||||
footer {
|
||||
grid-area: footer;
|
||||
border-top: solid 2px white;
|
||||
font-size: 12px;
|
||||
padding: 12px 0px 12px 0px;
|
||||
text-align: right;
|
||||
}
|
||||
|
||||
/*
|
||||
h1 {
|
||||
font-size: 24px;
|
||||
font-size: 24pt;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 20px;
|
||||
font-size: 20pt;
|
||||
}
|
||||
*/
|
||||
|
||||
div.info {
|
||||
font-size: 14px;
|
||||
|
|
|
@ -25,3 +25,10 @@
|
|||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
|
||||
@font-face {
|
||||
font-family: 'LePatinHelvete';
|
||||
src: url('/fonts/Le-patin-helvete.ttf') format('truetype');
|
||||
font-weight: normal;
|
||||
font-style: normal;
|
||||
}
|
||||
|
|
|
@ -1,16 +1,16 @@
|
|||
---
|
||||
title: Home
|
||||
title: Under Construction
|
||||
---
|
||||
|
||||
## Welcome, Comrades!
|
||||
## /!\\ Codeworks ahead /!\\
|
||||
|
||||
Hello there!
|
||||
|
||||
Welcome to this blog!
|
||||
As the 37th Chaos Communication Congress draws nearer a greater overhaul of this page is in order.
|
||||
|
||||
We are ChaosZone, mostly hackers from eastern countries, but all creatures are
|
||||
welcome. Meet us at our Assembly at 35C3.
|
||||
Come back soon for more Information on ChaosZone and its member hackerspaces.
|
||||
|
||||
The latest posts here are:
|
||||
Posts from previous years:
|
||||
|
||||
$partial("templates/post-list.html")$
|
||||
|
||||
|
|
42
src/Main.hs
42
src/Main.hs
|
@ -50,29 +50,29 @@ main = do
|
|||
defaultCtx
|
||||
>>= relativizeUrls
|
||||
|
||||
create ["index.html"] $ do
|
||||
route idRoute
|
||||
compile $ do
|
||||
post <- fmap head . recentFirst =<< (loadAll "site/posts/*"
|
||||
:: Compiler [Item String])
|
||||
let indexCtx =
|
||||
constField "date" "%B %e, %Y" <>
|
||||
defaultCtx
|
||||
makeItem (itemBody post)
|
||||
>>= relativizeUrls
|
||||
|
||||
-- match "site/index.md" $ do
|
||||
-- route $ myRoute `composeRoutes` setExtension "html"
|
||||
-- create ["index.html"] $ do
|
||||
-- route idRoute
|
||||
-- compile $ do
|
||||
-- posts <- fmap (take 5) . recentFirst =<< loadAll "site/posts/*"
|
||||
-- let indexCtx = listField "posts" postCtx (return posts) <>
|
||||
-- constField "title" "Home" <>
|
||||
-- post <- fmap head . recentFirst =<< (loadAll "site/posts/*"
|
||||
-- :: Compiler [Item String])
|
||||
-- let indexCtx =
|
||||
-- constField "date" "%B %e, %Y" <>
|
||||
-- defaultCtx
|
||||
-- getResourceBody
|
||||
-- >>= applyAsTemplate indexCtx
|
||||
-- >>= renderPandoc
|
||||
-- >>= loadAndApplyTemplate "templates/default.html" defaultCtx
|
||||
-- >>= relativizeUrls
|
||||
-- makeItem (itemBody post)
|
||||
-- >>= relativizeUrls
|
||||
|
||||
match "site/index.md" $ do
|
||||
route $ myRoute `composeRoutes` setExtension "html"
|
||||
compile $ do
|
||||
posts <- fmap (take 5) . recentFirst =<< loadAll "site/posts/*"
|
||||
let indexCtx = listField "posts" postCtx (return posts) <>
|
||||
constField "title" "Home" <>
|
||||
defaultCtx
|
||||
getResourceBody
|
||||
>>= applyAsTemplate indexCtx
|
||||
>>= renderPandoc
|
||||
>>= loadAndApplyTemplate "templates/default.html" defaultCtx
|
||||
>>= relativizeUrls
|
||||
|
||||
create ["archive.html"] $ do
|
||||
route idRoute
|
||||
|
|
|
@ -12,12 +12,11 @@
|
|||
<link rel="icon" type="image/svg+xml" href="/images/Chaoszone.svg">
|
||||
</head>
|
||||
<body>
|
||||
<div class="wrapper">
|
||||
<div id="logo">
|
||||
<a href="/">
|
||||
<img src="/images/Chaoszone_crest.36c3.svg" alt="ChaosZone">
|
||||
</a>
|
||||
</div>
|
||||
<div id="logo">
|
||||
<a href="/">
|
||||
<img src="/images/Chaoszone_crest.36c3.svg" alt="ChaosZone">
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<header id="header">
|
||||
<nav class="menu">
|
||||
|
@ -30,11 +29,10 @@
|
|||
</nav>
|
||||
</header>
|
||||
|
||||
<article id="content">
|
||||
<h1>$title$</h1>
|
||||
<article id="content">
|
||||
<h1>$title$</h1>
|
||||
$body$
|
||||
</article>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
<footer id="footer">
|
||||
last updated on: $curtime$ |
|
||||
|
|
Loading…
Reference in a new issue