moving stuff to make space for new front page

_layouts/main.html

@@ -9,22 +9,6 @@ layout: site
     <p class="center"><span> {{page.sub-title}} </span></p>
 		</div>
 	</div>
-	<div class="span2">
-		<div>
-  		<ul class="nav nav-list">
-        <li><a href="/index.html">  Ideas whence it started </a> </li>
-        <li><a href="/ideas.html"> Effective programming </a> </li>
-				<li>
-					Last news: &nbsp;&nbsp;&nbsp;
-					<small><small>{{ site.posts.first.date | date: "%d.%m.%y"  }} </small></small>
-				</li>
-				<li>
-					<a href="{{ site.posts.first.url }}">{{ site.posts.first.title }}
-					</a>
-				</li>
-  		</ul>
-		</div>
-	</div>
 </div>
 
 {{content}}

_layouts/project.html

@@ -0,0 +1,26 @@
+---
+layout: site
+---
+
+
+
+
+<div class="row vspace10">
+	<div class="span10">
+		<h2 class="center">{{page.title}}</h2>
+		<div>
+    <p class="center"><span> {{page.sub-title}} </span></p>
+		</div>
+	</div>
+	<div class="span2">
+		<div>
+  		<ul class="nav nav-list">
+				<li><a href="/project/motivation.html"> Motivation </a> </li>
+	      <li><a href="/project/ideas.html"> Ideas </a> </li>
+	      <li><a href="/project/history.html"> History </a> </li>
+  		</ul>
+		</div>
+	</div>
+</div>
+
+{{content}}

_layouts/site.html

@@ -38,14 +38,10 @@
              <a href="/book.html" >The Book</a>
            </li>
           <li class="link4">
-						<a href="/salama/layers.html">Salama</a>
+						<a href="/salama/layers.html">Architecture</a>
-					</li>
-
-					<li class="link5">
-						<a href="/qemu.html">Virtual Pi</a>
 					</li>
 					<li class="link6">
-						<a href="/about.html">About</a>
+						<a href="/project/motivation.html">Project</a>
 					</li>
 					<li class="link7">
 						<a href="/contribute.html">Contribute</a>
@@ -53,16 +49,6 @@
 					<li class="link8">
 						<a href="{{site.posts.first.url}}">News</a>
 					</li>
-
-          <!--
-					<li class="dropdown">
-						<a href="#" class="dropdown-toggle" data-toggle="dropdown">Various Pages <b class="caret"></b></a>
-						<ul class="dropdown-menu">
-							<li><a href="404.html">404</a></li>
-							<li><a href="faq.html">FAQ</a></li>
-						</ul>
-					</li>
-            -->
 				</ul>
 			</div>
 		</div>

contribute.md

@@ -18,6 +18,7 @@ The list is good for more general discussion.
 
 Then fork and work on a branch before sending pull request.
 
+If you don't have an arm, here are instructions to run an [emulator](/qemu.html) (on mac)
 
 I wrote some ideas in the about page, but here some more code related guidelines
 

css/stylesheet.css

@@ -61,7 +61,7 @@ hr {
 
 .navbar .nav > li > a {
     color: #555555;
-    padding: 15px 20px;
+    padding: 15px 40px;
     text-shadow: none;
     text-transform: uppercase;
     font-size: 12px;

project/history.html

@@ -1,10 +1,9 @@
 ---
-layout: site
+layout: project
 title: Salama, where it started
 ---
 
-<!-- story -->
+<div class="row vspace10">
-<div class="row vspace20">
   <div class="span12 center">
     <h1><span></span></h1>
     <p></p>

project/ideas.html

@@ -1,5 +1,5 @@
 ---
-layout: main
+layout: project
 title: Effectiveness, not efficiency
 sub-title: By way of a new look at programming.
 ---
@@ -81,8 +81,3 @@ sub-title: By way of a new look at programming.
     </p>
   </div>
 </div>
-
-
-
-
-

project/motivation.html

@@ -1,5 +1,5 @@
 ---
-layout: main
+layout: project
 title: Ruby in Ruby
 sub-title: Salama hopes make the the mysterious more accessible, shed light in the farthest (ruby) corners, and above all, <b>empower you</b>
 ---
@@ -61,6 +61,7 @@ sub-title: Salama hopes make the the mysterious more accessible, shed light in t
     </p>
   </div>
 </div>
+
 <div class="span12">
   <p class="center"><span> So what does empowerment mean. </span></p>
   <p>
@@ -96,7 +97,3 @@ sub-title: Salama hopes make the the mysterious more accessible, shed light in t
   </p>
   <p> And off course democracy decides what is good and what will stay. Natural extinction and all.</p>
 </div>
-
-
-
-

project/spiritual.md

@@ -1,5 +1,5 @@
 ---
-layout: main
+layout: project
 title: Yes, there is a spiritual side
 sub-title: It is the question that drives us
 ---
@@ -54,8 +54,9 @@ I noticed that quite quickly after i started the project, i was diverging radica
 is not just from my old ideas, which is nice in itself. A certain freshness and the fact that i am not just going over
 old ground. No, it's from any old ideas that i am aware of.
 
-I just noticed another salama project with similar goals, but sort of more traditional choices. Ie llvm to generate binaries
+I just noticed another crystal project with similar goals, but sort of more traditional choices (salama was called
-and a more static aproach. And that would have been me as a younger version. Now i go the long way because i know i have
+  crystal in the beginning). Ie llvm to generate binaries
+and a more static approach. And that would have been me as a younger version. Now i go the long way because i know i have
  all the time i need, and what matters is direction, not speed.
 
 The way it is happening is that i am reexamining just about everything i touch. A part of that is the kind of no stone