DG MS; author attribution in the stream; cleaned up some *new* stream styling
This commit is contained in:
parent
9f1d0b64b4
commit
83fec811cc
4 changed files with 64 additions and 3 deletions
|
|
@ -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)
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
// this is some gross shit.
|
||||
goToPost : $.noop
|
||||
});
|
||||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -68,6 +68,12 @@
|
|||
border : 2px solid #fff;
|
||||
}
|
||||
|
||||
&.smaller {
|
||||
height : 34px;
|
||||
width : 34px;
|
||||
border : 2px solid #ccc;
|
||||
}
|
||||
|
||||
&.micro {
|
||||
height : 24px;
|
||||
width : 24px;
|
||||
|
|
|
|||
15
app/assets/templates/stream-frame.jst.hbs
Normal file
15
app/assets/templates/stream-frame.jst.hbs
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
<div class="media author">
|
||||
{{#linkToPerson author}}
|
||||
<div class="img">
|
||||
<div class="profile-image-container smaller" style="background-image : url('{{avatar.large}}')"></div>
|
||||
</div>
|
||||
{{/linkToPerson}}
|
||||
|
||||
<div class="bd">
|
||||
{{#linkToPerson author}}
|
||||
{{name}}
|
||||
{{/linkToPerson}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="small-frame"></div>
|
||||
Loading…
Reference in a new issue