diff --git a/app/assets/javascripts/app/views/post/stream_frame.js b/app/assets/javascripts/app/views/post/stream_frame.js index 735f558db..ae98d3ebe 100644 --- a/app/assets/javascripts/app/views/post/stream_frame.js +++ b/app/assets/javascripts/app/views/post/stream_frame.js @@ -1,9 +1,25 @@ -app.views.Post.StreamFrame = app.views.Post.SmallFrame.extend({ +app.views.Post.StreamFrame = app.views.Base.extend({ + + className : "stream-frame", + + templateName : "stream-frame", + + subviews : { + ".small-frame" : "smallFrameView" + }, + + initialize : function() { + this.smallFrameView = new app.views.Post.SmallFrame({model : this.model}) + }, + events : _.extend({ 'click .content' : 'triggerInteracted' }, app.views.Post.SmallFrame.prototype.events), triggerInteracted : function() { app.page.trigger("frame:interacted", this.model) - } -}) \ No newline at end of file + }, + + // this is some gross shit. + goToPost : $.noop +}); \ No newline at end of file diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss index db12a9c8a..ce167e31e 100644 --- a/app/assets/stylesheets/new_styles/_canvas.scss +++ b/app/assets/stylesheets/new_styles/_canvas.scss @@ -372,11 +372,35 @@ background-color : #333; } + #stream-content { + .stream-frame { + margin-bottom : 40px; + + .info { + display : none; + } + + /* a media box object */ + .author { + margin : 0; + + .bd { + margin-top : 11px; + } + } + } + .canvas-frame { width: 100%; + margin : 0; + float : none; + .content { width: 100%; + + /* cursor overrides */ + cursor : pointer; } } } diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss index 506178986..3193e0751 100644 --- a/app/assets/stylesheets/new_styles/_profile.scss +++ b/app/assets/stylesheets/new_styles/_profile.scss @@ -68,6 +68,12 @@ border : 2px solid #fff; } + &.smaller { + height : 34px; + width : 34px; + border : 2px solid #ccc; + } + &.micro { height : 24px; width : 24px; diff --git a/app/assets/templates/stream-frame.jst.hbs b/app/assets/templates/stream-frame.jst.hbs new file mode 100644 index 000000000..ee0e4842c --- /dev/null +++ b/app/assets/templates/stream-frame.jst.hbs @@ -0,0 +1,15 @@ +
+ +