From 2bb677b34ba6279db832bcf885a0bf1433c4965b Mon Sep 17 00:00:00 2001
From: Dennis Collinson <dennis.collective@gmail.com>
Date: Fri, 23 Mar 2012 11:33:23 -0700
Subject: [PATCH] Revert "a little framer styling"

This reverts commit 0ba13491e50d67360d0ed9e2e77dc8095994b8fd.
---
 public/javascripts/app/pages/framer.js               |  4 +++-
 public/javascripts/app/templates/framer.handlebars   |  9 ++++-----
 .../app/templates/template-picker.handlebars         |  4 +---
 public/stylesheets/sass/new-templates.scss           | 12 ++++--------
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/public/javascripts/app/pages/framer.js b/public/javascripts/app/pages/framer.js
index f220f2f1a..1aee8f318 100644
--- a/public/javascripts/app/pages/framer.js
+++ b/public/javascripts/app/pages/framer.js
@@ -1,6 +1,8 @@
 app.pages.Framer = app.views.Base.extend({
   templateName : "framer",
-  className : "framer",
+
+  id : "post-content",
+
   events : {
     "click button.done" : "saveFrame"
   },
diff --git a/public/javascripts/app/templates/framer.handlebars b/public/javascripts/app/templates/framer.handlebars
index 33bf918f6..ca3e884d3 100644
--- a/public/javascripts/app/templates/framer.handlebars
+++ b/public/javascripts/app/templates/framer.handlebars
@@ -1,6 +1,5 @@
-<div class='template-picker form-inline'></div>
-
-<div id="post-content">
-    <div class="post-view"></div>
+<div class="controls">
+    <div class='template-picker'></div>
+    <button class="done btn-primary">done</button>
 </div>
-
+<div class="post-view"></div>
\ No newline at end of file
diff --git a/public/javascripts/app/templates/template-picker.handlebars b/public/javascripts/app/templates/template-picker.handlebars
index 3f5a513a6..9617e86f2 100644
--- a/public/javascripts/app/templates/template-picker.handlebars
+++ b/public/javascripts/app/templates/template-picker.handlebars
@@ -2,6 +2,4 @@
     {{#each templates}}
         <option value="{{.}}">{{.}}</option>
     {{/each}}
-</select>
-
-<button class="done btn-primary">done</button>
+</select>
\ No newline at end of file
diff --git a/public/stylesheets/sass/new-templates.scss b/public/stylesheets/sass/new-templates.scss
index 3592c3190..3c7c22d7d 100644
--- a/public/stylesheets/sass/new-templates.scss
+++ b/public/stylesheets/sass/new-templates.scss
@@ -226,6 +226,7 @@ $pane-width: 420px;
 
 .photo-fill {
   @include background-cover();
+  z-index : -5000; //so the framer controls don't get lost
   position: absolute;
   top: 0;
   left: 0;
@@ -249,6 +250,7 @@ $pane-width: 420px;
 }
 
 .rich-media {
+  z-index : -5000; //so the framer controls don't get lost
   position: absolute;
   height: 100%;
   width: 100%;
@@ -798,14 +800,8 @@ text-rendering: optimizelegibility;
   width: 100%;
 }
 
-.framer { //make this look way more glamourous, just providing structure.
-  .template-picker {
+#post-content {
+  button {
     position: absolute;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    padding : 20px;
-    background-color: #f0f0f0;
-    border-top: 1px solid #ccc;
   }
 }