[Snap Framework] snap-website branch, dogfood, updated. 2f5e85b5789ed0abdcc491ccd267eb0fcc2cd8d0

noreply at snapframework.com noreply at snapframework.com
Sun Apr 25 00:03:18 CDT 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "snap-website".

The branch, dogfood has been updated
       via  2f5e85b5789ed0abdcc491ccd267eb0fcc2cd8d0 (commit)
       via  00c23ff9f58962fe582fe510b26c29292e641806 (commit)
      from  3992b3446262a2a70eb794de8bf5a9b272aa28ca (commit)


Summary of changes:
 resources/path4774.png           |  Bin 0 -> 16290 bytes
 static/media/css/DroidSans.ttf   |  Bin 0 -> 149076 bytes
 static/media/css/main.css        |  115 +++++++++++++++++++++++++++----------
 static/media/css/menu-arrow.png  |  Bin 0 -> 282 bytes
 static/media/css/nav-back.png    |  Bin 0 -> 404 bytes
 static/media/css/splash-back.png |  Bin 0 -> 336 bytes
 static/media/img/Untitled.xcf    |  Bin 0 -> 13674 bytes
 static/media/img/head-logo.png   |  Bin 0 -> 5973 bytes
 static/media/img/nav-back.png    |  Bin 0 -> 404 bytes
 static/media/img/splash-2.png    |  Bin 0 -> 83354 bytes
 static/media/img/splash-img.png  |  Bin 0 -> 77063 bytes
 templates/index.tpl              |   44 +++++----------
 templates/nav.tpl                |   56 +++++++++++--------
 13 files changed, 131 insertions(+), 84 deletions(-)
 create mode 100644 resources/path4774.png
 create mode 100644 static/media/css/DroidSans.ttf
 create mode 100644 static/media/css/menu-arrow.png
 create mode 100644 static/media/css/nav-back.png
 create mode 100644 static/media/css/splash-back.png
 create mode 100644 static/media/img/Untitled.xcf
 create mode 100644 static/media/img/head-logo.png
 create mode 100644 static/media/img/nav-back.png
 create mode 100644 static/media/img/splash-2.png
 create mode 100644 static/media/img/splash-img.png

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2f5e85b5789ed0abdcc491ccd267eb0fcc2cd8d0
Merge: 00c23ff 3992b34
Author: James Sanders <james.sanders at thisismedium.com>
Date:   Sun Apr 25 01:02:59 2010 -0400

    Merge branch 'dogfood' of git.snapframework.com:snap-website into dogfood

commit 00c23ff9f58962fe582fe510b26c29292e641806
Author: James Sanders <james.sanders at thisismedium.com>
Date:   Sun Apr 25 01:02:34 2010 -0400

    Added gradients.

diff --git a/resources/path4774.png b/resources/path4774.png
new file mode 100644
index 0000000..bbdb3b1
Binary files /dev/null and b/resources/path4774.png differ
diff --git a/static/media/css/DroidSans.ttf b/static/media/css/DroidSans.ttf
new file mode 100644
index 0000000..458ba59
Binary files /dev/null and b/static/media/css/DroidSans.ttf differ
diff --git a/static/media/css/main.css b/static/media/css/main.css
index 585ff19..2e666f1 100644
--- a/static/media/css/main.css
+++ b/static/media/css/main.css
@@ -1,4 +1,12 @@
 @font-face {
+   font-family: "Droid Sans";
+   src: url("DroidSans.ttf") format("truetype");
+}
+ at font-face {
+   font-family: "Droid Serif";
+   src: url("DroidSerif-Regular.ttf") format("truetype");
+}
+ at font-face {
     font-family: "PT Sans";
     src: url("PT_Sans.ttf") format("truetype");
 }
@@ -14,7 +22,7 @@
   ------------------------------------------------------------------------*/
 body,html{
     font-size: 13pt;
-    font-family: "Georgia", "Arial", "Helvetica", sans-serif;
+    font-family: "Droid Sans", "Georgia", "Arial", "Helvetica", sans-serif;
     line-height: 1.7em;
     color:#0c1a30;
     /*background:#fff url(holy-light.png) scroll repeat-x top left;*/
@@ -68,6 +76,9 @@ li:before {
     content: "» ";
 }
 
+img {
+    border:0;
+}
 
 /*--------------------------------------------------------------------------
  * styling for css classes
@@ -134,43 +145,50 @@ li:before {
 /*--------------------------------------------------------------------------
  * styling for divs with ids
   ------------------------------------------------------------------------*/
-#content {
+.content {
     width: 960px;
     margin: 0 auto;
+    overflow:hidden;
+    position: relative;
 }
 
 #main{
     margin: 0;
     padding: 0;
     width:100%;
+    background: url("holy-light.png") repeat-x scroll left -30px #FFFFFF;
 }
 
 #splash{
     width: 100%;
-    width: 720px;
-    margin: 32px auto 16px auto;
-/*    background: url(sun-spots.png) scroll no-repeat center;*/
-}
-
-#splash .logo {
-    text-align: center;
-    font-size: 16pt;
-    width: 350px;
-    margin-right: 20px;
-    float: left;
-}
-
-#splash .blurb {
-    margin-top: 38px;
-    width: 350px;
-    font-size: 20pt;
-    float: left;
+    overflow:hidden;
+    background:#2e5d9c;
+    padding: 0;
+    background: url(splash-back.png) scroll repeat-x top left;
+    position:relative;
+ }
+#splash .logo img {
+    width: 800px;
+    margin: 0 auto;
+    display: block;
 }
+#splash .blurb{
+    position:absolute;
+    top: 35%;
+    right: 75px;
+    font-size: 1.7em;
+    width: 50%;
+    line-height: 1.2em;
+    font-family: "PT Sans";
+    font-style: italic;
+    letter-spacing: 0.01em;
+    text-shadow: 1px 1px #DAE6F5;
+    color: #1f4986;
+ }
 
 
 #triptych {
-    /*background: #2C558A;*/
-    background: #C4E7FF;
+    background: #f1f1f1;
     /*background: #D6EFFF;*/
     color: #000;
     width: 100%;
@@ -246,17 +264,45 @@ li:before {
 }
 
 
-#nav {
+
+
+#heading{
     width: 100%;
-    background: #231C69;
+    background: #132742 url(nav-back.png) scroll repeat-x bottom left;
     color: #C4E7FF;
     padding: 3px 0;
+    padding-left:0em;
+    padding-top:45px;
+    margin:0;
+    overflow:hidden;
+    border-bottom: 10px #2e5d9c solid;
+}
+#heading .inner{
+    width: 960px;
+    margin:0 auto;
+    overflow:hidden;
+    line-height: 1em;
+    padding-bottom:5px;
+}
+#heading h1{
+    margin:0;
+    padding:0;
+    float:left;
+    margin: 0 auto;
+    line-height:0.1em;
 }
 
-#nav .heading {
-    float: left;
-    margin: 0 0 0 1em;
-    font-family: "Gill Sans", "PT Sans", "Arial", sans-serif;
+#nav{
+
+   /* background:#513c1e;*/
+
+   overflow:hidden;
+   color: #C4E7FF;
+   padding:2px;
+   padding-left:0;
+   padding-right:0;
+   padding-bottom: 4px;
+   float:right;
 }
 
 #nav .heading span {
@@ -264,8 +310,7 @@ li:before {
 }
 
 #nav .navlist {
-    float: right;
-    margin: 0 1em 0 0;
+float:left;
 }
 
 #nav a:link, #nav a:visited {
@@ -280,11 +325,19 @@ li:before {
     padding: 0;
     margin: 0;
     display: inline;
+
 }
 
 #nav li {
     list-style-type: none;
-    display: inline;
+    float:left;
+    letter-spacing: -0.01em;
+    margin:0 20px;
+    font-family: "Droid Sans";
+    text-shadow: 1px 1px #142845;
 }
 
+#nav li:before {
+    content: "";
+}
 
diff --git a/static/media/css/menu-arrow.png b/static/media/css/menu-arrow.png
new file mode 100644
index 0000000..9424def
Binary files /dev/null and b/static/media/css/menu-arrow.png differ
diff --git a/static/media/css/nav-back.png b/static/media/css/nav-back.png
new file mode 100644
index 0000000..6a1f5d9
Binary files /dev/null and b/static/media/css/nav-back.png differ
diff --git a/static/media/css/splash-back.png b/static/media/css/splash-back.png
new file mode 100644
index 0000000..9233aa9
Binary files /dev/null and b/static/media/css/splash-back.png differ
diff --git a/static/media/img/Untitled.xcf b/static/media/img/Untitled.xcf
new file mode 100644
index 0000000..478af3d
Binary files /dev/null and b/static/media/img/Untitled.xcf differ
diff --git a/static/media/img/head-logo.png b/static/media/img/head-logo.png
new file mode 100644
index 0000000..03529be
Binary files /dev/null and b/static/media/img/head-logo.png differ
diff --git a/static/media/img/nav-back.png b/static/media/img/nav-back.png
new file mode 100644
index 0000000..169875e
Binary files /dev/null and b/static/media/img/nav-back.png differ
diff --git a/static/media/img/splash-2.png b/static/media/img/splash-2.png
new file mode 100644
index 0000000..a3d70e0
Binary files /dev/null and b/static/media/img/splash-2.png differ
diff --git a/static/media/img/splash-img.png b/static/media/img/splash-img.png
new file mode 100644
index 0000000..8122c16
Binary files /dev/null and b/static/media/img/splash-img.png differ
diff --git a/templates/index.tpl b/templates/index.tpl
index c24ec99..4b36f3c 100644
--- a/templates/index.tpl
+++ b/templates/index.tpl
@@ -1,4 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+          "http://www.w3.org/TR/html4/loose.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  
   <head>
     <title>Snap: Haskell Web Framework</title>
     <meta name="author" content="The Snap Framework Team"/>
@@ -7,48 +10,31 @@
     <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8"/>
     <meta http-equiv="content-style-type" content="text/css"/>
   </head>
+
   <body>
+
     <div id="main">
+
       <apply template="nav"/>
 
       <div id="splash">
-        <div class="logo">
-          <img src="/media/img/logo-alt.png" title="Snap Framework" /><br/>
-        </div>
-
-        <div class="blurb">
-          <em>a super-fast web framework for the
-            <a href="http://www.haskell.org">Haskell</a> programming language.</em>
+        <div class="content">
+            <img src="/media/img/splash-img.png" title="Snap Framework" />
+          <div class="blurb">
+              a super-fast web framework for the
+              <a href="http://www.haskell.org"><strong>Haskell</strong></a> 
+              programming language.
+          </div>
         </div>
-
-        <div class="clear"></div>
       </div>
 
       <div id="triptych">
         <div class="triptych-content">
-          <div class="panel">
-            <a href="/download">
-              <img src="/media/img/snap-dialog-logo.png" /><br/>
-              Easy to get started: no-hassle installation
-            </a>
-          </div>
-          <div class="panel">
-            <a href="/FIXME">
-              <img src="/media/img/placeholder.png"/><br/>
-              Ships with a super-fast HTTP server
-            </a>
-          </div>
-          <div class="panel">
-            <a href="/FIXME">
-              <img src="/media/img/placeholder.png"/><br/>
-              Well-documented and tested
-            </a>
-          </div>
-          <div class="clear"></div>
+          <img src="/media/img/splash-2.png" />
         </div>
       </div>
 
-      <div id="content">
+      <div class="content">
         <div class="newspaper">
           <div id="about" class="section left">
             <div class="inner">
diff --git a/templates/nav.tpl b/templates/nav.tpl
index 567a916..2da1d13 100644
--- a/templates/nav.tpl
+++ b/templates/nav.tpl
@@ -1,25 +1,33 @@
-<div id="nav" class="nav">
-  <div class="heading">
-    <span>SNAP</span>FRAMEWORK
+<div id="heading">
+
+  <div class="inner">
+
+    <h1>
+      <a href="/" ><img src="/media/img/head-logo.png" title="Snap Framwork" /></a>
+    </h1>
+
+
+    <div id="nav" class="nav">           
+      <div class="navlist">
+        <ul class="nav">
+          <li>
+            <a href="/">Home</a>
+          </li>
+          <li>
+            <a href="/download">Download</a>
+          </li>
+          <li>
+            <a href="/docs">Docs</a>
+          </li>
+          <li>
+            <a href="/contribute">Contribute</a>
+          </li>
+          <li>
+            <a href="/about">About</a>
+          </li>
+        </ul>
+      </div>
+    </div>
+
   </div>
-  <div class="navlist">
-    <ul class="nav">
-      <li>
-        <a href="/">Home</a>
-      </li>
-      <li>
-        <a href="/download">Download</a>
-      </li>
-      <li>
-        <a href="/docs">Docs</a>
-      </li>
-      <li>
-        <a href="/contribute">Contribute</a>
-      </li>
-      <li>
-        <a href="/about">About</a>
-      </li>
-    </ul>
-  </div>
-  <div class="clear"></div>
-</div>
+</div>
\ No newline at end of file
-----------------------------------------------------------------------


hooks/post-receive
-- 
snap-website


More information about the Snap mailing list