Merge pull request #298 from juhp/master

package tweaks; 16px; simplify resolver

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;
 }

templates/home.hamlet

@@ -45,7 +45,7 @@
                 Stackage provides consistent sets of Haskell packages, known to build together and pass their tests before becoming <a href="/nightly">Stackage Nightly</a> snapshots and <a href="/lts">LTS</a>
                 (<a href="https://github.com/fpco/lts-haskell#readme">Long Term Support</a>) releases.
             <p>
-                It is a distribution of a subset packages from <a href="https://hackage.haskell.org">Hackage</a>, 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 <a href="https://hackage.haskell.org">Hackage</a>, each package chosen at a version to make the set self-consistent. Note that Stackage does not patch any packages.
             <p>
                 We recommend using the <a href="https://haskellstack.org">stack</a> 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.

templates/package.hamlet

@@ -18,10 +18,8 @@ $newline never
                #{pname}
             <p .synopsis>
                 #{piSynopsis}
-               \ #
+            $maybe url <- piHomepage
-               $maybe url <- piHomepage
+                <p><a href="#{url}">#{url}</a>
-                   <a href="#{url}">
-                       #{url}
 
             <table>
               $maybe displayedVersion <- mdisplayedVersion
@@ -99,52 +97,21 @@ $newline never
                                      <a href="mailto:#{renderEmail email}">
                                          #{renderEmail email}
 
-
             $maybe sppi <- msppi
                 $with spi <- sppiSnapshotPackageInfo sppi
+                    $maybe pantryCabal <- sppiPantryCabal sppi
+                        <div .pantry-version>
+                            This version can be pinned in stack with:
+                            <code>#{pantryCabal}
                     <div .docs>
                         <h4>
                             Module documentation for #{spiVersion spi}
-                        $maybe pantryCabal <- sppiPantryCabal sppi
-                            <div .pantry-version>
-                                This version can be pinned in stack with:
-                                <code>#{pantryCabal}
                         $if null (sppiModuleNames sppi)
                             <p>There are no documented modules for this package.
                         $else
                             ^{hoogleForm (spiSnapName spi)}
                             ^{renderModules sppi}
 
-$if not (LT.null (LT.renderHtml piReadme))
-    <div .markdown-container .readme-container>
-        <div .container .content>
-            <div .row>
-                <div .span12 .expanding>
-                    #{piReadme}
-                    <div .bottom-gradient>
-                        <i class="fa fa-angle-down">
-$elseif not (LT.null (LT.renderHtml piDescription))
-    <div .markdown-container .readme-container>
-        <div .container .content>
-            <div .row>
-                <div .span12 .expanding>
-                    #{piDescription}
-                    <div .bottom-gradient>
-                        <i class="fa fa-angle-down">
-
-$if not (LT.null (LT.renderHtml piChangelog))
-    <div .container .content id=changes>
-       <div .row>
-           <div .span12>
-               <h2 .changes-title>Changes
-    <div .markdown-container .changelog-container .content>
-        <div .container>
-            <div .row>
-                <div .span12 .expanding>
-                    #{piChangelog}
-                    <div .bottom-gradient>
-                        <i class="fa fa-angle-down">
-
 <div .container #snapshot-home .content>
     <div .row>
         <div .span12>
@@ -175,15 +142,32 @@ $if not (LT.null (LT.renderHtml piChangelog))
                               $if (sppiReverseDepsCount sppi > maxDisplayedDeps)
                                 , <em>and many more</em>
 
+$if not (LT.null (LT.renderHtml piReadme))
+    <div .markdown-container .readme-container>
+        <div .container .content>
+            <div .row>
+                <div .span12 .expanding>
+                    #{piReadme}
+                    <div .bottom-gradient>
+                        <i class="fa fa-angle-down">
+$elseif not (LT.null (LT.renderHtml piDescription))
+    <div .markdown-container .readme-container>
+        <div .container .content>
+            <div .row>
+                <div .span12 .expanding>
+                    #{piDescription}
+                    <div .bottom-gradient>
+                        <i class="fa fa-angle-down">
 
-$# Too much spam on Disqus, remove it
+$if not (LT.null (LT.renderHtml piChangelog))
-
+    <div .container .content id=changes>
-$#<div .container .content>
+       <div .row>
-$#    <div .row>
+           <div .span12>
-$#        <div .span12>
+               <h2 .changes-title>Changes
-$#          <div id="disqus_thread">
+    <div .markdown-container .changelog-container .content>
-$#              <script>
+        <div .container>
-$#                  var disqus_shortname = "fpcomplete"; (function() { var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true; dsq.src = 'https://' + disqus_shortname + '.disqus.com/embed.js'; (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq); })();
+            <div .row>
-$#              <a class="dsq-brlink" href="https://disqus.com">
+                <div .span12 .expanding>
-$#                  comments powered by
+                    #{piChangelog}
-$#                  <span class="logo-disqus">Disqus
+                    <div .bottom-gradient>
+                        <i class="fa fa-angle-down">

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 {

templates/stackage-home.hamlet

@@ -8,12 +8,9 @@ $newline never
         <span>
             <a href=@{StackageDiffR previousSnapName name}>View changes
 
-    <p>To use this resolver:
+    <p>To use this resolver, edit your stack.yaml and set the following:
-      <p>edit your stack.yaml and set the following:
       <p .stack-resolver-yaml>resolver: #{toPathPiece name}
-    <p>or on the command line use:
+    <p>or on the command line use: <code>stack --resolver #{toPathPiece name}</code>
-      <code>stack --resolver #{toPathPiece name}</code>
-
     <p>For more details see <a href="http://docs.haskellstack.org">the stack homepage</a>
 
     <h3>Hoogle

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;
-}