diff --git a/app/assets/javascripts/app/views/single-post-viewer/single_post_comment_stream.js b/app/assets/javascripts/app/views/single-post-viewer/single_post_comment_stream.js
index ebb0a9dbf632b52bd28fd3483568290330531bfd..9bf53e3b0c389f2ad7161a96e25cd91ee68e87fa 100644
--- a/app/assets/javascripts/app/views/single-post-viewer/single_post_comment_stream.js
+++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_comment_stream.js
@@ -20,7 +20,7 @@ app.views.SinglePostCommentStream = app.views.CommentStream.extend({
postRenderTemplate: function() {
app.views.CommentStream.prototype.postRenderTemplate.apply(this);
- this.$(".new_comment_form_wrapper").removeClass('hidden');
+ this.$(".new-comment-form-wrapper").removeClass("hidden");
_.defer(this.highlightPermalinkComment);
},
diff --git a/app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js b/app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js
index e2345f985117a21f9d18c0a0b0d885ab95b46801..9d11a3ca99f775e98d2e582cf48999083316932e 100644
--- a/app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js
+++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_content_view.js
@@ -7,6 +7,7 @@ app.views.SinglePostContent = app.views.Base.extend({
templateName: "single-post-viewer/single-post-content",
tooltipSelector: "time, .post_scope",
+ className: "framed-content",
subviews : {
"#single-post-actions" : "singlePostActionsView",
diff --git a/app/assets/javascripts/app/views/single-post-viewer/single_post_interactions.js b/app/assets/javascripts/app/views/single-post-viewer/single_post_interactions.js
index b8c4a8661a0f766b7d4da926b36dc9f467d9022e..9549a74a5d639653d8f1d3d0ba50149269f89b61 100644
--- a/app/assets/javascripts/app/views/single-post-viewer/single_post_interactions.js
+++ b/app/assets/javascripts/app/views/single-post-viewer/single_post_interactions.js
@@ -3,6 +3,7 @@
app.views.SinglePostInteractions = app.views.Base.extend({
templateName: "single-post-viewer/single-post-interactions",
tooltipSelector: ".avatar.micro",
+ className: "framed-content",
subviews: {
'#comments': 'commentStreamView'
diff --git a/app/assets/javascripts/app/views/stream_post_views.js b/app/assets/javascripts/app/views/stream_post_views.js
index 30af6a13a17483d43f7de72a1506f78c99437eb7..b298cd0adcec15ee9fdb06d6848612b25c574243 100644
--- a/app/assets/javascripts/app/views/stream_post_views.js
+++ b/app/assets/javascripts/app/views/stream_post_views.js
@@ -143,7 +143,7 @@ app.views.StreamPost = app.views.Post.extend({
focusCommentTextarea: function(evt){
evt.preventDefault();
- this.$(".new_comment_form_wrapper").removeClass("hidden");
+ this.$(".new-comment-form-wrapper").removeClass("hidden");
this.$(".comment_box").focus();
return this;
diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss
index 0993dc8a92a1e3e3a618c725925bbab71d827278..1142980436b1cb0473dc104d044c200a85974afa 100644
--- a/app/assets/stylesheets/base.scss
+++ b/app/assets/stylesheets/base.scss
@@ -18,6 +18,7 @@ body {
.page-people.action-show,
.page-people.action-contacts,
.page-photos,
+.page-posts,
.page-profiles.action-edit,
.page-services.action-index,
.page-streams,
diff --git a/app/assets/stylesheets/comments.scss b/app/assets/stylesheets/comments.scss
index 6f0b9ea5fd68862c8bffa02d9fe17e2a2b06940b..0ad5cb838b6d120e08fed50a4a1165c1f9e16866 100644
--- a/app/assets/stylesheets/comments.scss
+++ b/app/assets/stylesheets/comments.scss
@@ -8,7 +8,8 @@
}
.media { margin-top: 10px; }
}
- .comments > .comment, .comment.new_comment_form_wrapper {
+ .comments > .comment,
+ .comment.new-comment-form-wrapper {
.avatar {
height: 35px;
width: 35px;
diff --git a/app/assets/stylesheets/single-post-view.scss b/app/assets/stylesheets/single-post-view.scss
index 0166d18029edbaf9934d642e838a85745edbafd1..db82724604fd5ddf84272aa05fc2c694e919233c 100644
--- a/app/assets/stylesheets/single-post-view.scss
+++ b/app/assets/stylesheets/single-post-view.scss
@@ -3,9 +3,9 @@
}
#single-post-content {
- border-right: solid 1px #cccccc;
- #head {
+ .head {
padding-bottom: 10px;
+ padding-top: 5px;
border-bottom: 1px solid $border-grey;
#post-info {
.author{ color: $grey; }
@@ -26,12 +26,12 @@
.near-from {
color: $text-grey;
font-size: 12px;
- margin: 10px 20px 0px 15px;
+ margin: 10px 15px 0;
}
.mapContainer {
- margin: 10px 20px 0px 15px;
+ margin: 10px 15px 0;
}
- .row.reshare {
+ .reshare {
border-top: 1px solid lighten($border-grey,5%);
padding-top: 10px;
margin-top: 10px;
@@ -99,44 +99,16 @@
}
}
- #body {
- margin-left: 20px;
- padding-top: 20px;
- width: auto;
-
- #real-post-content div.reshare {
- border-left: 2px solid #DDD;
- padding-left: 10px;
- }
+ .body {
+ padding: 20px 15px;
.nsfw-off { display: none; }
.nsfw-shield { display: none; }
- .oembed { width: 95%; }
- .photo_attachments {
- img.big_stream_photo { max-width: 90%; }
- }
}
}
#single-post-interactions {
- border-left: 1px solid #cccccc;
- position: relative;
- left: -1px;
- margin-left: 0;
- padding-left: 15px;
-
- .comment.media .img {
- margin-left: 5px;
- }
-
- .no_comments {
- padding-top: 10px;
- padding-bottom: 10px;
- background-color: $background-grey;
- text-align: center;
- border-radius: 4px;
- margin-bottom: 30px;
- }
+ .no-comments { text-align: center; }
a {
color: $blue;
@@ -161,4 +133,8 @@
img{ display: inline; }
}
+ .comments > .comment,
+ .comment.new-comment-form-wrapper {
+ padding: 10px;
+ }
}
diff --git a/app/assets/templates/comment-stream_tpl.jst.hbs b/app/assets/templates/comment-stream_tpl.jst.hbs
index ac8f118e416bdcd8efb1392042256919c10c1fe9..1bbf98bbab0edcf213c7794045349b00604b5300 100644
--- a/app/assets/templates/comment-stream_tpl.jst.hbs
+++ b/app/assets/templates/comment-stream_tpl.jst.hbs
@@ -11,7 +11,7 @@
<div class="comments"> </div>
{{#if loggedIn}}
- <div class="comment media new_comment_form_wrapper {{#unless commentsCount}} hidden {{/unless}}">
+ <div class="comment media new-comment-form-wrapper {{#unless commentsCount}} hidden {{/unless}}">
{{#with current_user}}
<a href="/people/{{guid}}" class="img">
{{{personImage this}}}
diff --git a/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs b/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
index 9295117eb463f2bc2662b5b4b4e9b3fad87c06dd..75d051777b0360f3033b133e19f9cd642a17cfc9 100644
--- a/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
+++ b/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
@@ -1,4 +1,4 @@
-<div id="head" class="row">
+<div id="head" class="head clearfix">
<div class="col-md-12">
<div class="row">
<div id="post-info" class="col-md-8">
@@ -103,7 +103,9 @@
{{/if}}
</div>
</div>
-<div id="body" class="row">
- <div id="real-post-content" class="post-content col-md-12">
+<div class="row">
+ <div id="body" class="body clearfix">
+ <div id="real-post-content" class="post-content col-md-12">
+ </div>
</div>
</div>
diff --git a/app/assets/templates/single-post-viewer/single-post-interactions_tpl.jst.hbs b/app/assets/templates/single-post-viewer/single-post-interactions_tpl.jst.hbs
index 9cc61e9dbac718e6727ebe66d9d75b85863c8d8a..23c59b2773b1c180b1cf095556d7113d37b2fb15 100644
--- a/app/assets/templates/single-post-viewer/single-post-interactions_tpl.jst.hbs
+++ b/app/assets/templates/single-post-viewer/single-post-interactions_tpl.jst.hbs
@@ -36,7 +36,7 @@
</span>
</div>
{{else}}
- <div class='no_comments'>
+ <div class="no-comments">
<h4>{{t "comments.no_comments" }}</h4>
</div>
{{/if}}
diff --git a/app/assets/templates/single-post-viewer_tpl.jst.hbs b/app/assets/templates/single-post-viewer_tpl.jst.hbs
index f06916a63374c878e835e5cae45cf152ed143be7..3060591956c442595e0ecb9541c2bc8b3ea74914 100644
--- a/app/assets/templates/single-post-viewer_tpl.jst.hbs
+++ b/app/assets/templates/single-post-viewer_tpl.jst.hbs
@@ -1,4 +1,4 @@
-<div id='single-post-container' class='container-fluid'>
+<div id="single-post-container">
<div class='row'>
<div id='single-post-content' class='col-md-6 single-post-content'>
</div>