contact section in column, looks terrible

4 files changed, 23 insertions, 8 deletions

diff --git a/site/index.js b/site/index.js
index 50bd870..712c01c 100644
--- a/site/index.js
+++ b/site/index.js
@@ -61,7 +61,8 @@ var app  = okcms.createApp({
   views: {
     '/': {
       data: [
-        {type: 'page', query: '*'},
+        {type: 'page', query: 'contact'},
+//         {type: 'shape', query: 'about-images'},
         {type: 'shape', query: 'shape-images'},
         {type: 'retail', query: '*'},
         {type: 'advertising', query: '*'},
diff --git a/site/public/assets/javascripts/_env.js b/site/public/assets/javascripts/_env.js
index 3a72e13..2857069 100644
--- a/site/public/assets/javascripts/_env.js
+++ b/site/public/assets/javascripts/_env.js
@@ -70,6 +70,7 @@ environment.ready = function(){
       display_entry($loader.children()[0])
     })
 	})	
+/*
 	$("nav .contact").click(function(e){
     e.preventDefault()
     
@@ -85,6 +86,7 @@ environment.ready = function(){
       display_entry($loader.children()[0])
     })
 	})	
+*/
 	$("nav .index").click(function (e){
     e && e.preventDefault()
     if (done_loading && window.location.hash == "#/index") return
@@ -153,7 +155,7 @@ environment.ready = function(){
     $(this).data("hash", page)
   })
   hashes['/about'] = $("nav .about")
-  hashes['/contact'] = $("nav .contact")
+  // hashes['/contact'] = $("nav .contact")
   // hashes['/index'] = $("nav .index")
 
   if (current_hash in hashes) {
diff --git a/site/public/assets/style.css b/site/public/assets/style.css
index 6316159..27e3158 100644
--- a/site/public/assets/style.css
+++ b/site/public/assets/style.css
@@ -285,9 +285,9 @@ nav .middle {
 }
 
 nav .bottom {
-  height: 20%;
+  height: 22%;
 	width: 100%;
-	background: #bbb;
+	background: #ddd;
 }
 nav a {
 	text-decoration:none;
@@ -295,7 +295,18 @@ nav a {
 	width:100%;
 	color:black;
 }
+.contact {
+  line-height: 22px;
+  padding-left: 10px;
+  padding-right: 10px;
+}
+.contact a {
+  display: inline;
+}
 
+
+
+.desktop nav .cat.about,
 .desktop nav .cat.hover,
 .desktop nav .cat:hover {
 	cursor:pointer;
@@ -428,7 +439,7 @@ nav .sub.active a {
 	display: inline-block;
 	width: 80%;
 	width: calc(87% - 80px);
-	margin-left: 160px;	
+	margin-left: 180px;	
 }
 .entry.all {
 	width: 90%;
@@ -907,7 +918,6 @@ nav .sub.active a {
 }
 
 
-
 @media (max-width:1200px) {
 	.entry span div.content {
 		-webkit-column-count: 2;
diff --git a/site/templates/index.liquid b/site/templates/index.liquid
index 244e95a..ab28a39 100644
--- a/site/templates/index.liquid
+++ b/site/templates/index.liquid
@@ -115,7 +115,9 @@ WEBSITE BY OKFOCUS, http://okfoc.us, Internet Legends.
 	</div>
 	<div class="bottom">
 		<div class="cat about">ABOUT</div>
-		<div class="cat contact">CONTACT</div>
+		<div class="contact">
+		  {{ page.body | newline_to_br }}
+		</div>
 	</div>
 </nav>
 
@@ -235,7 +237,7 @@ WEBSITE BY OKFOCUS, http://okfoc.us, Internet Legends.
 </div>
 
 <script type="text/plain" id="preload-image-list">
-{% for page in pages %}{{ page.image }}
+{% for image in about.images %}{{ image.uri }}
 {% endfor %}</script>
 <script type="text/plain" id="box-image-list">
 {% for image in shape.images %}{{ image.uri }}