From f91b964d8e2583c86dac1f8d33e9b9ade11a6a6d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 3 Nov 2020 10:57:19 +0800 Subject: [PATCH 1/4] home: fix typo in About --- templates/home.hamlet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/home.hamlet b/templates/home.hamlet index 1c71fba..c273ab1 100644 --- a/templates/home.hamlet +++ b/templates/home.hamlet @@ -45,7 +45,7 @@ Stackage provides consistent sets of Haskell packages, known to build together and pass their tests before becoming Stackage Nightly snapshots and LTS (Long Term Support) releases.

- It is a distribution of a subset packages from Hackage, each package chosen at a version to make the set self-consistent. Note that Stackage does not patch any packages. + It is a distribution of a subset of packages from Hackage, each package chosen at a version to make the set self-consistent. Note that Stackage does not patch any packages.

We recommend using the stack tool, which makes using Stackage snapshots easy and convenient. But Stackage can also be used in other ways: as a source of consistent packages that work well together, or to ensure that Haskell packages you author or care about work well with others. From cf4c4cc15024133dd36795157caf0c41ec09d025 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 3 Nov 2020 10:58:38 +0800 Subject: [PATCH 2/4] default to 16px everywhere 14px seems really quite small drop old .date and .cabal classes --- templates/default-layout.lucius | 2 +- templates/package.lucius | 1 - templates/stackage-home.lucius | 9 --------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/templates/default-layout.lucius b/templates/default-layout.lucius index be5abbe..e0155ee 100644 --- a/templates/default-layout.lucius +++ b/templates/default-layout.lucius @@ -10,6 +10,7 @@ html { body { background: #f0f0f0; font-family: 'Lato', sans-serif; + font-size: 16px; margin-bottom: 4em; padding-bottom: 2em; } @@ -75,6 +76,5 @@ h1,h2,h3,h4,h5 { } .content { - font-size: 16px; line-height: 30px; } diff --git a/templates/package.lucius b/templates/package.lucius index ad7eb9a..a53c748 100644 --- a/templates/package.lucius +++ b/templates/package.lucius @@ -164,7 +164,6 @@ h3 { } pre,pre code,code { font-family: ubuntu mono, dejavu sans mono, monospace; - font-size: 15px; background: #f8f8f8; } pre { diff --git a/templates/stackage-home.lucius b/templates/stackage-home.lucius index c32c9a9..2920990 100644 --- a/templates/stackage-home.lucius +++ b/templates/stackage-home.lucius @@ -11,11 +11,6 @@ h2 { color: #555 !important; } -.date { - font-size: 15px; - line-height: 15px; -} - hr { border: 1px solid #ddd } @@ -88,7 +83,3 @@ p + ul { font-size: 1.3em; font-weight: 600; } - -.cabal { - font-size: 0.9em; -} From d16fca78f3d685562029e94eae759fd6139953cf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 3 Nov 2020 10:59:44 +0800 Subject: [PATCH 3/4] stackage-home: simplify the snapshot resolver text --- templates/stackage-home.hamlet | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/stackage-home.hamlet b/templates/stackage-home.hamlet index 74f005f..3f1e205 100644 --- a/templates/stackage-home.hamlet +++ b/templates/stackage-home.hamlet @@ -8,12 +8,9 @@ $newline never View changes -

To use this resolver: -

edit your stack.yaml and set the following: +

To use this resolver, edit your stack.yaml and set the following:

resolver: #{toPathPiece name} -

or on the command line use: - stack --resolver #{toPathPiece name} - +

or on the command line use: stack --resolver #{toPathPiece name}

For more details see the stack homepage

Hoogle From 6b910d77a52559332f3fe8e7161efff70128ac9f Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 3 Nov 2020 11:01:13 +0800 Subject: [PATCH 4/4] package: layout tweaks - put project url on a newline - put pinning above Module docs - move deps to before Readme & Changelog --- templates/package.hamlet | 84 ++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 50 deletions(-) diff --git a/templates/package.hamlet b/templates/package.hamlet index 62bb56e..3ee3112 100644 --- a/templates/package.hamlet +++ b/templates/package.hamlet @@ -18,10 +18,8 @@ $newline never #{pname}

#{piSynopsis} - \ # - $maybe url <- piHomepage - - #{url} + $maybe url <- piHomepage +

#{url} $maybe displayedVersion <- mdisplayedVersion @@ -99,52 +97,21 @@ $newline never #{renderEmail email} - $maybe sppi <- msppi $with spi <- sppiSnapshotPackageInfo sppi + $maybe pantryCabal <- sppiPantryCabal sppi +
+ This version can be pinned in stack with: + #{pantryCabal}

Module documentation for #{spiVersion spi} - $maybe pantryCabal <- sppiPantryCabal sppi -
- This version can be pinned in stack with: - #{pantryCabal} $if null (sppiModuleNames sppi)

There are no documented modules for this package. $else ^{hoogleForm (spiSnapName spi)} ^{renderModules sppi} -$if not (LT.null (LT.renderHtml piReadme)) -

-
-
-
- #{piReadme} -
- -$elseif not (LT.null (LT.renderHtml piDescription)) -
-
-
-
- #{piDescription} -
- - -$if not (LT.null (LT.renderHtml piChangelog)) -
-
-
-

Changes -
-
-
-
- #{piChangelog} -
- -
@@ -175,15 +142,32 @@ $if not (LT.null (LT.renderHtml piChangelog)) $if (sppiReverseDepsCount sppi > maxDisplayedDeps) , and many more +$if not (LT.null (LT.renderHtml piReadme)) +
+
+
+
+ #{piReadme} +
+ +$elseif not (LT.null (LT.renderHtml piDescription)) +
+
+
+
+ #{piDescription} +
+ -$# Too much spam on Disqus, remove it - -$#
-$#
-$#
-$#
-$#