From b387f89164cf9dadbe08c2a7107c462d09738a36 Mon Sep 17 00:00:00 2001
From: Maxwell Salzberg <maxwell@joindiaspora.com>
Date: Thu, 26 Apr 2012 12:45:18 -0700
Subject: [PATCH] make composer not clip in both views [ci skip]

---
 app/assets/javascripts/app/pages/framer.js     | 2 ++
 app/assets/stylesheets/new_styles/_base.scss   | 7 +++++++
 app/assets/templates/composer-controls.jst.hbs | 8 +++++---
 app/assets/templates/profile.jst.hbs           | 2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/app/pages/framer.js b/app/assets/javascripts/app/pages/framer.js
index 41478c87e..52afcfc57 100644
--- a/app/assets/javascripts/app/pages/framer.js
+++ b/app/assets/javascripts/app/pages/framer.js
@@ -43,11 +43,13 @@ app.views.framerControls = app.views.Base.extend({
   },
 
   saveFrame : function(){
+    //how do we make this work for the not
     var parentDoc = parent;
     this.model.save({}, {success : function(){ parentDoc.closeIFrame() }})
   }
 });
 
+//crazy hack for model publisher.
 function closeIFrame(){
   location.reload()
 };
\ No newline at end of file
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
index 7d9c6399b..e75d9d866 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/new_styles/_base.scss
@@ -355,6 +355,9 @@ div[data-template=flow] {
 .post-form {
   display : table-cell;
   vertical-align : middle;
+  .container{
+    margin: 0 50px;
+  }
 }
 
 .flow-controls {
@@ -371,6 +374,7 @@ div[data-template=flow] {
   box-sizing: border-box;
   -moz-box-sizing: border-box;
 
+
   .controls {
     margin: 0 auto;
     max-width: 960px;
@@ -380,6 +384,9 @@ div[data-template=flow] {
     button {
       float : right;
     }
+    #controls-wrapper {
+      margin: 0 9%;
+    }
   }
 
   .aspect-selector {
diff --git a/app/assets/templates/composer-controls.jst.hbs b/app/assets/templates/composer-controls.jst.hbs
index f2eaa1673..a7911c0fe 100644
--- a/app/assets/templates/composer-controls.jst.hbs
+++ b/app/assets/templates/composer-controls.jst.hbs
@@ -1,3 +1,5 @@
-<button class="done btn-primary next">Next</button>
-<div class="aspect-selector"/>
-<div class="service-selector"/>
+<div id='controls-wrapper'>
+  <button class="done btn-primary next">Next</button>
+  <div class="aspect-selector"/>
+  <div class="service-selector"/>
+</div>
diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs
index a58b89949..9d3881441 100644
--- a/app/assets/templates/profile.jst.hbs
+++ b/app/assets/templates/profile.jst.hbs
@@ -14,7 +14,7 @@
 <section id="profile-info"/>
 
 <div id="composer" style="display:none;">
-    <iframe src="/posts/new" height=600 width=900 style="border:none;"></iframe>
+    <iframe src="/posts/new" height=400 width=700 style="border:none;"></iframe>
 </div>
 
 <section id="profile-controls">