From cfa518674fd753189fad4b70eb888beaef11fc55 Mon Sep 17 00:00:00 2001
From: Dennis Collinson <dennis.collective@gmail.com>
Date: Mon, 23 Apr 2012 16:44:32 -0700
Subject: [PATCH] MS DC MOAR profile tweaks, show cubbies posts

---
 app/assets/javascripts/app/views/small_frame.js |  3 +++
 app/assets/stylesheets/new_styles/_canvas.scss  | 13 +++++++++++--
 app/assets/templates/small-frame.jst.hbs        |  8 ++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/app/views/small_frame.js b/app/assets/javascripts/app/views/small_frame.js
index 1e323b773..2d973c566 100644
--- a/app/assets/javascripts/app/views/small_frame.js
+++ b/app/assets/javascripts/app/views/small_frame.js
@@ -80,6 +80,9 @@ app.views.SmallFrame = app.views.Base.extend({
     this.render()
 
     app.page.stream.trigger("reLayout")
+    //trigger moar relayouts in the case of images WHOA GROSS HAX
+    _.delay(function(){app.page.stream.trigger("reLayout")}, 200)
+    _.delay(function(){app.page.stream.trigger("reLayout")}, 500)
   },
 
   goToPost : function() {
diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss
index aff264c8e..538b668fd 100644
--- a/app/assets/stylesheets/new_styles/_canvas.scss
+++ b/app/assets/stylesheets/new_styles/_canvas.scss
@@ -8,7 +8,7 @@ $two-column-width : $raw-two-column-width - 30;  //simply subtract an arbitrary
 $margin-between-rows : 20;
 
 $row-height : $column-width;
-$two-row-height : $raw-two-column-width + $margin-between-rows;
+$two-row-height : $raw-two-column-width - 20;
 
 /* colors : http://www.colourlovers.com/palette/2134203/Awezome_in_argyle */
 $cyan : rgb(8,204,249);
@@ -66,7 +66,6 @@ body {
     position : relative;
 
     background-color : #fff;
-    min-height : $column-width + px;
 
     width : $column-width + px;
     min-width : $column-width + px;
@@ -138,6 +137,15 @@ body {
     line-height : 1.2em;
   }
 
+  &.sticky-note {
+    .content{
+      min-height : $column-width + px;
+      .text-content {
+        margin: 20px;
+      }
+    }
+  }
+
   &.cyan .background-color   { background-color : rgba($cyan, 0.2); }
   &.green .background-color  { background-color : rgba($green, 0.2); }
   &.yellow .background-color { background-color : rgba($yellow, 0.2); }
@@ -178,6 +186,7 @@ body {
 
   /* larger declarations */
   &.x2.width  .content { @include wide(); }
+  &.sticky-note.x2.height  .content { @include tall(); }
 
   &.scale-horizontal .content img,
   &.scale-horizontal .content .image-container {width : 100%;  }
diff --git a/app/assets/templates/small-frame.jst.hbs b/app/assets/templates/small-frame.jst.hbs
index e077977cb..11f4f4f6f 100644
--- a/app/assets/templates/small-frame.jst.hbs
+++ b/app/assets/templates/small-frame.jst.hbs
@@ -16,6 +16,14 @@
         </div>
     {{/if}}
 
+    {{#if object_url}}
+        <div class="image-container">
+            <a href="{{object_url}}" class="stream-photo-link">
+                <img src="{{image_url}}" data-small-photo="{{image_url}}" data-full-photo="{{image_url}}" class="stream-photo" />
+            </a>
+        </div>
+    {{/if}}
+
     {{#if o_embed_cache.data}}
         <div class="embed-frame">
             {{{o_embed_cache.data.html}}}