First pass on the home page (I've added a separate layout for the hom…

…e page but I hope be able to remove this eventually ..)
lazyatom · May 7, 2011 · 16e59b6 · 16e59b6
1 parent 7bf488b
commit 16e59b6
Show file tree

Hide file tree

Showing 3 changed files with 92 additions and 10 deletions.
diff --git a/pristine_app/public/vanilla.css b/pristine_app/public/vanilla.css
@@ -259,4 +259,51 @@ a {
 
 .malformed_snip_inclusion {
   background-color: rgba(180,0,0,0.2);
+}
+
+/* 7. Welcome page
+--------------------------------------------- */
+
+.container {
+}
+
+#welcome {
+  margin-bottom: 40px;
+  border-bottom: 1px solid #ddd;
+}
+
+#welcome h1 {
+  font-style: italic;
+  padding-top: 80px;
+  font-size: 40px;
+  font-family: Constantia, Palatino, "Palatino Linotype", "Book Antiqua", Georgia, serif;
+  line-height: 40px;
+  margin-bottom: 0;
+}
+
+#welcome h1 a {
+  font-size: 80px;
+  line-height: 80px;
+  display: block;
+  font-style: normal;
+  border-bottom: 4px solid #f3ea7c;
+}
+
+#welcome p {
+  margin-top: 100px;
+  line-height: 40px;
+  font-style: italic;
+  margin-bottom: 0;
+  font-size: 20px;
+}
+
+#welcome p strong {
+  font-size: 22px;
+}
+
+#description p {
+}
+
+#description p:first-child {
+
 }
diff --git a/pristine_app/soups/base/home.snip b/pristine_app/soups/base/home.snip
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+  <title>{page_title}</title>
+  <link rel="stylesheet" href="/vanilla.css" type="text/css" media="screen" title="no title" charset="utf-8">
+</head>
+<body>
+  <div id="controls">
+    <ul class="container clearfix">
+      <li><a href="/" class="home">Vanilla.rb</a></li>
+      <li>{link_to index}</li>
+      <li>you are viewing: {link_to_current_snip}</li>
+    </ul>
+  </div>
+  <div class="container clearfix">
+    {current_snip}
+  </div>
+</body>
+</html>
diff --git a/pristine_app/soups/base/start.snip b/pristine_app/soups/base/start.snip
@@ -1,19 +1,34 @@
-<h1>Welcome to Vanilla.rb</h1>
+<div id="welcome" class="grid_16 alpha">
+  <h1 class="grid_8 alpha">Welcome to <a href="/">Vanilla.rb</a></h1>
+  <p class="grid_6 omega"><strong>A web-experiment (a <em>websperiment</em>?)</strong> about storing and reusing data on a website.</p>
+</div>
 
-<p>Vanilla.rb is a web-experiment (a <em>websperiment</em>?) about storing and reusing data on a website. It can also function as a <a href="http://www.wikipedia.com/wiki/Bliki">bliki</a>.</p>
+<div class="grid_16 alpha">
+  <div class="grid_8 alpha">
+    <h2>Learn about how to use Vanilla</h2>
 
-<p>From a technical perspective, vanilla is a Ruby rack application, and should play well within the rack ecosystem. It uses a simple document store called `soup` to store data.</p>
+    <p>First time? You should investigate the {link_to tutorial} for some orientation.</p>
 
-<h2>What now?</h2>
+    <h2>Adding your content</h2>
 
-<p>If this is your first time using vanilla, you should investigate the {link_to tutorial} for some orientation.</p>
+    <p>This is the {link_to start} snip, which is the default home page. You can find this content in `start.snip`.</p>
 
-<h2>What next?</h2>
+    <p>You should replace this content with whatever you want on your site's home page.</p>
 
-<p>This is the {link_to start} snip, which is the default home page. You can find this content in `start.snip`.</p>
+    <h2>And finally &hellip;</h2>
 
-<p>You should replace this content with whatever you want on your site's home page.</p>
+    <p>Once your site is ready to run, you'll probably want to remove the tutorial; you can do this by editing the configuration in `config.ru`, and deleting the `soups/tutorial` directory.</p>
 
-<p>Once your site is ready to run, you'll probably want to remove the tutorial; you can do this by editing the configuration in `config.ru`, and deleting the `soups/tutorial` directory.</p>
+    <p>Good luck!</p>
+  </div>
 
-<p>Good luck!</p>
+  <div id="description" class="grid_6 omega">
+    <h2>Under the hood</h2>
+    <p>Vanilla is written in Ruby and is a Rack application. This means it will also fit nicely into any existing Rack ecosystem.</p>
+    <p>It uses a simple document store called `soup` to store data.</p>
+    <p>It can also function as a <a href="http://www.wikipedia.com/wiki/Bliki">bliki</a></p>
+  </div>
+</div>
+
+
+:layout: home