From 44f28b8220ab085588c76585c57e10521000116d Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Tue, 24 Apr 2012 14:21:18 -0700 Subject: [PATCH] don't randomly fav things; fix wallpaper text on profile [ci skip] --- app/assets/javascripts/app/views/small_frame.js | 4 ++-- app/assets/stylesheets/new_styles/_canvas.scss | 2 +- app/assets/templates/small-frame.jst.hbs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/views/small_frame.js b/app/assets/javascripts/app/views/small_frame.js index ed2f4a19d..5105f7710 100644 --- a/app/assets/javascripts/app/views/small_frame.js +++ b/app/assets/javascripts/app/views/small_frame.js @@ -5,8 +5,8 @@ app.views.SmallFrame = app.views.Base.extend({ templateName : "small-frame", events : { - "click .fav" : "favoritePost", - "click .content" : "goToPost" + "click .content" : "goToPost", + "click .fav" : "goToPost" }, presenter : function(){ diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss index 81be78793..ab58f4dad 100644 --- a/app/assets/stylesheets/new_styles/_canvas.scss +++ b/app/assets/stylesheets/new_styles/_canvas.scss @@ -216,7 +216,7 @@ body { } &.day:not(.sticky-note), - &.has-text:not(.sticky-note), + &.has-text:not(.sticky-note):not(.wallpaper), &.night:not(.sticky-note), &.multi-photo:not(.sticky-note) { .text-content { diff --git a/app/assets/templates/small-frame.jst.hbs b/app/assets/templates/small-frame.jst.hbs index b90ced0ac..61117ce6f 100644 --- a/app/assets/templates/small-frame.jst.hbs +++ b/app/assets/templates/small-frame.jst.hbs @@ -1,6 +1,6 @@
- + {{#if photos}}