initial layout

bcjordan · Nov 29, 2011 · 4102c1f · 4102c1f
1 parent 2e25839
commit 4102c1f
Show file tree

Hide file tree

Showing 13 changed files with 505 additions and 12 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,6 @@
 source :rubygems
 
 gem 'RedCloth'
-gem 'jekyll'
+gem 'jekyll'
+gem 'haml'
+gem 'sass'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,6 +8,7 @@ GEM
       fast-stemmer (>= 1.0.0)
     directory_watcher (1.4.1)
     fast-stemmer (1.0.0)
+    haml (3.1.4)
     jekyll (0.11.0)
       albino (>= 1.3.2)
       classifier (>= 1.3.1)
@@ -20,11 +21,14 @@ GEM
     maruku (0.6.0)
       syntax (>= 1.0.0)
     posix-spawn (0.3.6)
+    sass (3.1.11)
     syntax (1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   RedCloth
+  haml
   jekyll
+  sass
diff --git a/_includes/nav.html b/_includes/nav.html
@@ -0,0 +1,5 @@
+<ul class="nav">
+{% for post in site.posts %}
+<li><a href="{{post.url}}">{{post.title}}</a></li>
+{% endfor %}
+</ul>
diff --git a/_includes/nav.markdown b/_includes/nav.markdown
@@ -0,0 +1 @@
+{% for post in site.posts %}[{{post.title}}]({{post.url}}) - {% endfor %} [150CM](http://www.cs.tufts.edu/comp/150CM/syllabus.html)
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -1,7 +1,107 @@
-<html>
-<body>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Keyboard Learning Task: {{page.title}}</title>
+    <meta name="description" content="Keyboard Learning Task website">
+    <meta name="author" content="Brian Jordan">
 
-  {{ content }}
+    <!-- Le HTML5 shim, for IE6-8 support of HTML elements -->
+    <!--[if lt IE 9]>
+      <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
 
-</body>
-</html>
+    <!-- Le styles -->
+    <script src="{{page.script}}"></script>
+    <link rel="stylesheet" href="/css/style.css" type="text/css" media="screen" title="no title" charset="utf-8">
+    <link href="/css/bootstrap.min.css" rel="stylesheet">
+    <style type="text/css">
+      /* Override some defaults */
+      html, body {
+        background-color: #eee;
+      }
+      body {
+        padding-top: 40px; /* 40px to make the container go all the way to the bottom of the topbar */
+      }
+      .container > footer p {
+        text-align: center; /* center align it with the container */
+      }
+      .container {
+        width: 820px; /* downsize our container to make the content feel a bit tighter and more cohesive. NOTE: this removes two full columns from the grid, meaning you only go to 14 columns and not 16. */
+      }
+
+      /* The white background content wrapper */
+      .content {
+        background-color: #fff;
+        padding: 20px;
+        margin: 0 -20px; /* negative indent the amount of the padding to maintain the grid system */
+        -webkit-border-radius: 0 0 6px 6px;
+           -moz-border-radius: 0 0 6px 6px;
+                border-radius: 0 0 6px 6px;
+        -webkit-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+           -moz-box-shadow: 0 1px 2px rgba(0,0,0,.15);
+                box-shadow: 0 1px 2px rgba(0,0,0,.15);
+      }
+
+      /* Page header tweaks */
+      .page-header {
+        background-color: #f5f5f5;
+        padding: 20px 20px 10px;
+        margin: -20px -20px 20px;
+      }
+
+      /* Styles you shouldn't keep as they are for displaying this base example only */
+      .content .span10,
+      .content .span4 {
+        min-height: 500px;
+      }
+      /* Give a quick and non-cross-browser friendly divider */
+      .content .span4 {
+        margin-left: 0;
+        padding-left: 19px;
+        border-left: 1px solid #eee;
+      }
+
+      .topbar .btn {
+        border: 0;
+      }
+
+    </style>
+  </head>
+
+  <body>
+    <div class="topbar">
+      <div class="fill">
+        <div class="container">
+          <a class="brand" href="/">Keyboard Learning Task</a>
+          {% include nav.html %}
+        </div>
+      </div>
+    </div>
+
+    <div class="container">
+      <div class="content">
+        <div class="page-header">
+          <h1>{{page.title}} <small>{{page.description}}</small></h1>
+        </div>
+        <div class="row">
+          <div class="span10">
+            {{content}}
+          </div>
+          {%if page.log %}
+          <div class="span4">
+            <h3>Log:</h3>
+            <div id="{{ page.log }}">This is log.</div>
+          </div>
+          {% endif %}
+        </div>
+      </div>
+
+      <footer>
+        <p>By Brian Jordan, 2011. <a href="http://github.com/bcjordan">Fork this on Github</a></p>
+      </footer>
+
+    </div> <!-- /container -->
+
+  </body>
+</html>
diff --git a/_layouts/login.html b/_layouts/login.html
@@ -0,0 +1,5 @@
+<form action="" class="pull-right">
+  <input class="input-small" type="text" placeholder="Username">
+  <input class="input-small" type="password" placeholder="Password">
+  <button class="btn" type="submit">Sign in</button>
+</form>
diff --git a/_posts/2011-11-29-task1.markdown b/_posts/2011-11-29-task1.markdown
@@ -0,0 +1,11 @@
+---
+layout: default
+title: Letter Task
+permalink: /tasks/1.html
+script: /js/1.js
+log: log
+---
+
+Welcome to task 1.
+
+<div id="canvas" class="span10">This is canvas.</div>
diff --git a/_posts/2011-12-28-about.markdown b/_posts/2011-12-28-about.markdown
@@ -0,0 +1,7 @@
+---
+layout: default
+title: Project Description
+permalink: /description.html
+---
+
+This project...