diff --git a/app/assets/javascripts/app/views/small_frame.js b/app/assets/javascripts/app/views/small_frame.js index 2153641c7..b8ce1e1f9 100644 --- a/app/assets/javascripts/app/views/small_frame.js +++ b/app/assets/javascripts/app/views/small_frame.js @@ -8,6 +8,12 @@ app.views.SmallFrame = app.views.Base.extend({ "click .content" : "goToPost" }, + presenter : function(){ + //todo : we need to have something better for small frame text, probably using the headline() scenario. + return _.extend(this.defaultPresenter(), + {text : this.model && app.helpers.textFormatter(this.model.get("text"), this.model)}) + }, + postRenderTemplate : function() { this.$el.addClass(this.photoClass() + ' ' + this.textClass()) }, diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss index c817fa2a3..b214df154 100644 --- a/app/assets/stylesheets/new_styles/_canvas.scss +++ b/app/assets/stylesheets/new_styles/_canvas.scss @@ -49,6 +49,12 @@ body { -webkit-transform : scale(0.98); } + //hax to deal with markdownify + p { + font-size: inherit; + line-height: inherit; + } + position : relative; background-color : #fff; diff --git a/app/assets/stylesheets/new_styles/_spinner.scss b/app/assets/stylesheets/new_styles/_spinner.scss index 22b098d97..0e9c72ba1 100644 --- a/app/assets/stylesheets/new_styles/_spinner.scss +++ b/app/assets/stylesheets/new_styles/_spinner.scss @@ -4,6 +4,7 @@ text-align: center; width: 100%; display: block; + clear: both; .loader { display: inline-block; diff --git a/app/assets/templates/small-frame.jst.hbs b/app/assets/templates/small-frame.jst.hbs index 85c5978e3..1000218b0 100644 --- a/app/assets/templates/small-frame.jst.hbs +++ b/app/assets/templates/small-frame.jst.hbs @@ -11,7 +11,7 @@ {{/if}}
- {{text}} + {{{text}}}