Style tweaks

8 years ago · 0e6f08aae0
8 changed files with 64 additions and 29 deletions
--- a/design/favicon.svg
+++ b/design/favicon.svg
@ -14,7 +14,10 @@
   id="svg11681"
   version="1.1"
   inkscape:version="0.48.4 r9939"
-   sodipodi:docname="New document 88">
+   sodipodi:docname="favicon.svg"
+   inkscape:export-filename="/home/chris/Projects/stackage-server/static/img/favicon.png"
+   inkscape:export-xdpi="22.5"
+   inkscape:export-ydpi="22.5">
  <defs
     id="defs11683" />
  <sodipodi:namedview
--- a/templates/default-layout-wrapper.hamlet
+++ b/templates/default-layout-wrapper.hamlet
@ -8,6 +8,7 @@ $newline never
    <head>
        <meta charset="UTF-8">
        <link rel="shortcut icon" href=@{StaticR img_favicon_ico} />
+        <link href="http://fonts.googleapis.com/css?family=Lato:400,700" rel="stylesheet" type="text/css">

        <title>
            #{pageTitle pc}
--- a/templates/default-layout.lucius
+++ b/templates/default-layout.lucius
@ -11,17 +11,20 @@ body {
  background: #f0f0f0;
  margin:0 0 4em;
  padding:0;
-  /* font-family: 'Open Sans'; */
-  font-family: Sawasdee;
+  font-family: 'Lato', sans-serif;
  text-shadow: 1px 1px 1px #ffffff;
  font-size: 20px;
-  line-height: 24px;
+  line-height: 30px;
 }

 p {
  margin-top: 20px;
 }

+code {
+  color: #555;
+}
+
 .wrap {
  padding-top: 2em;
  padding-left: 15px;
@ -29,19 +32,10 @@ p {
  padding-bottom: 2em;
 }

-h1 {
-  font-weight: normal;
-  font-size: 50px;
-  line-height: 55px;
-  margin-bottom: 30px;
-}
-
-h2 {
+h1,h2 {
  font-weight: normal;
  color: #06537d;
  font-size: 45px;
-  margin-top: 50px;
-  margin-bottom: 40px;
 }

 li + li {
--- a/templates/homepage.hamlet
+++ b/templates/homepage.hamlet
@ -1,4 +1,7 @@
 <div .container>
+    <p>
+        Stackage is an infrastructure to create stable builds
+        of complete package sets. Think “stable Hackage”.
    <h2 .recommended-snapshots>Recommended Snapshots
    <ul .snapshots>
        $forall (E.Value ident, E.Value title, E.Value uploaded, E.Value display, E.Value handle) <- stackages
@ -6,10 +9,6 @@
                <a href=@{StackageHomeR ident}>
                    #{title}

-    <h1>
-        Stackage is an infrastructure to create stable builds
-        of complete package sets. Think “stable Hackage”.
-
    <h2 .how-stackage-works>How Stackage Works
    <div .row .stackage-process>
        <div .span3>
@ -46,14 +45,25 @@
        <div .span12>
            <h2>Steps to Contribute
            <ul>
-                <li>Open the Stackage project on Github.
-                <li>Fork it.
-                <li>Add a line to the Stackage.Config module.
-                <li>Push to your fork.
-                <li>Open a pull request.
+                <li>
+                    Open
+                    <a href="https://github.com/fpco/stackage">
+                        the Stackage project on Github.
+                <li>
+                    Fork it.
+                <li>
+                    Add a line to
+                    <a href="https://github.com/fpco/stackage/blob/master/Stackage/Config.hs">
+                        the Stackage.Config module.
+                <li>
+                    Push to your fork.
+                <li>
+                    Open a pull request.
            <p>
                Once you have submitted the pull request, a build will be started.
-                There is a dedicated jenkins server at this location: jenkins.stackage.org
+                There is a dedicated jenkins server at this location:
+                <a href="http://jenkins.stackage.org">
+                    jenkins.stackage.org
                From there you can track the progress, status and
                results of Stackage builds.

@ -64,4 +74,6 @@
                We're offering custom installations for businesses who want to
                build their development platform upon Stackage. If you're
                considering this for your business and want to find out more,
-                please email us at: sales@fpcomplete.com
+                please email us at:
+                <a href="mailto:sales@fpcomplete.com">
+                    sales@fpcomplete.com
--- a/templates/homepage.lucius
+++ b/templates/homepage.lucius
@ -1,5 +1,6 @@
-h1 {
+h2 {
  margin-top: 50px;
+  margin-bottom: 40px;
 }

 .recommended-snapshots {
--- a/templates/stackage-home.hamlet
+++ b/templates/stackage-home.hamlet
@ -1,9 +1,27 @@
+$newline never
 <div .container>
    <hgroup>
        <h1>#{stackageTitle stackage}
-        <p>Uploaded by #{userDisplay user} (#{userHandle user}) on #{tshow $ stackageUploaded stackage}
-    <p>#{stackageDesc stackage}
+        <p>
+            #{userDisplay user} (#{userHandle user})
+        <p>
+            #{stackageDesc stackage}
+        <p>
+            Uploaded on #{tshow $ stackageUploaded stackage}
    <hr>
-    <p>To use, add a line like the following to ~/.cabal/config:
+    <p>To use, copy the following to your #
+        <code>~/.cabal/config
+        \:

    <pre>remote-repo: stackage:@{StackageHomeR ident}
+
+    <small>
+        Note: Remove or comment out any existing #
+        <code>remote-repo
+        \ line.
+
+    <p>
+        Run the following to update your packages:
+    <pre>
+        <code>
+            \$ cabal update
--- a/templates/stackage-home.lucius
+++ b/templates/stackage-home.lucius
@ -0,0 +1,3 @@
+h1 {
+  font-size: 30px !important;
+}
--- a/templates/upload.lucius
+++ b/templates/upload.lucius
@ -0,0 +1,3 @@
+h1 {
+  margin-bottom: 30px;
+}