Skip to content

Commit a48b1fd

Browse files
hvrhvr
committed
Upgrade to more recent Hakyll/Pandoc
As a result, some minor fixups were needed to the CSS & markdown markup This also adds support for building the site w/ GHC 8.4.4 & GHC 8.6.3
1 parent f00ccf1 commit a48b1fd

3 files changed

Lines changed: 68 additions & 43 deletions

File tree

‎css/default.css‎

Lines changed: 61 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,68 @@
22

33
code{white-space: pre;}
44

5-
div.sourceCode { overflow-x: auto; }
6-
table.sourceCode, tr.sourceCode, td.lineNumbers, td.sourceCode {
7-
margin: 0; padding: 0; vertical-align: baseline; border: none; }
8-
table.sourceCode { width: 100%; line-height: 100%; }
9-
td.lineNumbers { text-align: right; padding-right: 4px; padding-left: 4px; color: #aaaaaa; border-right: 1px solid #aaaaaa; }
10-
td.sourceCode { padding-left: 5px; }
11-
code > span.kw { color: #007020; font-weight: bold; } /* Keyword */
12-
code > span.dt { color: #902000; } /* DataType */
13-
code > span.dv { color: #40a070; } /* DecVal */
14-
code > span.bn { color: #40a070; } /* BaseN */
15-
code > span.fl { color: #40a070; } /* Float */
16-
code > span.ch { color: #4070a0; } /* Char */
17-
code > span.st { color: #4070a0; } /* String */
18-
code > span.co { color: #60a0b0; font-style: italic; } /* Comment */
19-
code > span.ot { color: #007020; } /* Other */
20-
code > span.al { color: #ff0000; font-weight: bold; } /* Alert */
21-
code > span.fu { color: #06287e; } /* Function */
22-
code > span.er { color: #ff0000; font-weight: bold; } /* Error */
23-
code > span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
24-
code > span.cn { color: #880000; } /* Constant */
25-
code > span.sc { color: #4070a0; } /* SpecialChar */
26-
code > span.vs { color: #4070a0; } /* VerbatimString */
27-
code > span.ss { color: #bb6688; } /* SpecialString */
28-
code > span.im { } /* Import */
29-
code > span.va { color: #19177c; } /* Variable */
30-
code > span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
31-
code > span.op { color: #666666; } /* Operator */
32-
code > span.bu { } /* BuiltIn */
33-
code > span.ex { } /* Extension */
34-
code > span.pp { color: #bc7a00; } /* Preprocessor */
35-
code > span.at { color: #7d9029; } /* Attribute */
36-
code > span.do { color: #ba2121; font-style: italic; } /* Documentation */
37-
code > span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
38-
code > span.cv { color: #60a0b0; font-weight: bold; font-style: italic; } /* CommentVar */
39-
code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
405

6+
a.sourceLine { display: inline-block; line-height: 1.25; }
7+
a.sourceLine { pointer-events: none; color: inherit; text-decoration: inherit; }
8+
a.sourceLine:empty { height: 1.2em; }
9+
.sourceCode { overflow: visible; }
10+
code.sourceCode { white-space: pre; position: relative; }
11+
div.sourceCode { margin: 1em 0; }
12+
pre.sourceCode { margin: 0; }
13+
@media screen {
14+
div.sourceCode { overflow: auto; }
15+
}
16+
@media print {
17+
code.sourceCode { white-space: pre-wrap; }
18+
a.sourceLine { text-indent: -1em; padding-left: 1em; }
19+
}
20+
pre.numberSource a.sourceLine
21+
{ position: relative; left: -4em; }
22+
pre.numberSource a.sourceLine::before
23+
{ content: attr(title);
24+
position: relative; left: -1em; text-align: right; vertical-align: baseline;
25+
border: none; pointer-events: all; display: inline-block;
26+
-webkit-touch-callout: none; -webkit-user-select: none;
27+
-khtml-user-select: none; -moz-user-select: none;
28+
-ms-user-select: none; user-select: none;
29+
padding: 0 4px; width: 4em;
30+
color: #aaaaaa;
31+
}
32+
pre.numberSource { margin-left: 3em; border-left: 1px solid #aaaaaa; padding-left: 4px; }
33+
div.sourceCode
34+
{ }
35+
@media screen {
36+
a.sourceLine::before { text-decoration: underline; }
37+
}
38+
code span.al { color: #ff0000; font-weight: bold; } /* Alert */
39+
code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
40+
code span.at { color: #7d9029; } /* Attribute */
41+
code span.bn { color: #40a070; } /* BaseN */
42+
code span.bu { } /* BuiltIn */
43+
code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
44+
code span.ch { color: #4070a0; } /* Char */
45+
code span.cn { color: #880000; } /* Constant */
46+
code span.co { color: #60a0b0; font-style: italic; } /* Comment */
47+
code span.cv { color: #60a0b0; font-weight: bold; font-style: italic; } /* CommentVar */
48+
code span.do { color: #ba2121; font-style: italic; } /* Documentation */
49+
code span.dt { color: #902000; } /* DataType */
50+
code span.dv { color: #40a070; } /* DecVal */
51+
code span.er { color: #ff0000; font-weight: bold; } /* Error */
52+
code span.ex { } /* Extension */
53+
code span.fl { color: #40a070; } /* Float */
54+
code span.fu { color: #06287e; } /* Function */
55+
code span.im { } /* Import */
56+
code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
57+
code span.kw { color: #007020; font-weight: bold; } /* Keyword */
58+
code span.op { color: #666666; } /* Operator */
59+
code span.ot { color: #007020; } /* Other */
60+
code span.pp { color: #bc7a00; } /* Preprocessor */
61+
code span.sc { color: #4070a0; } /* SpecialChar */
62+
code span.ss { color: #bb6688; } /* SpecialString */
63+
code span.st { color: #4070a0; } /* String */
64+
code span.va { color: #19177c; } /* Variable */
65+
code span.vs { color: #4070a0; } /* VerbatimString */
66+
code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
4167

4268
/* General styling */
4369

‎pvp-faq.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Haskell PVP FAQ
33
---
44

5-
# Haskell Package Versioning Policy FAQ ^^[DRAFT]^^
5+
# Haskell Package Versioning Policy FAQ
66

77
This FAQ is intended answer questions related to aspects commonly
88
being brought up in discussions involving the Haskell

‎pvp-site.cabal‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1+
cabal-version: 2.2
12
name: pvp-site
23
version: 1.0
3-
build-type: Simple
4-
cabal-version: >= 2.0
5-
tested-with: GHC == 8.0.2, GHC == 8.2.1
4+
tested-with: GHC == 8.0.2 || == 8.2.2 || == 8.4.4 || == 8.6.3
65

76
executable pvp-site
87
main-is: site.hs
98
hs-source-dirs: src/
10-
build-depends: base ^>= 4.9.0 || ^>= 4.10.0
11-
, hakyll ^>= 4.9.2
12-
, pandoc ^>= 1.19.2
13-
, pandoc-types ^>= 1.17
9+
build-depends: base ^>= 4.9.0.0 || ^>= 4.10.0.0 || ^>= 4.11.0.0 || ^>= 4.12.0.0
10+
, hakyll ^>= 4.12.5.0
11+
, pandoc ^>= 2.6
12+
, pandoc-types ^>= 1.17.5.4
1413
ghc-options: -threaded
1514
default-language: Haskell2010

0 commit comments

Comments
 (0)