More entry header styling + entry body.

services/web/app/views/project/editor/editor.jade

@@ -68,17 +68,17 @@ div.full-size(
 										i.rp-icon-delete(ng-switch-when="delete")
 
 									.rp-entry-metadata
-										{{ users[entry.metadata.user_id].name }} {{ entry.metadata.ts }}
+										p.rp-entry-metadata-line(style="color: hsl({{ users[entry.metadata.user_id].hue }}, 70%, 50%);") {{ users[entry.metadata.user_id].name }} 
+										p.rp-entry-metadata-line {{ entry.metadata.ts }}
 									.rp-entry-avatar(style="background-color: hsl({{ users[entry.metadata.user_id].hue }}, 70%, 50%);") {{ users[entry.metadata.user_id].avatar_text }}
-								.rp-entry-body
-									{{ entry.content }}
-<<<<<<< HEAD
-								.review-entry-actions
+								.rp-entry-body(ng-switch="entry.type")
+										span(ng-switch-when="insert") Added 
+											span.rp-content-highlight &nbsp;{{ entry.content }} 
+										span(ng-switch-when="delete") Deleted
+											span.rp-content-highlight &nbsp;{{ entry.content }} 
+								.rp-entry-actions
 									a(href, ng-click="acceptChange(entry_id)") Accept
 									a(href, ng-click="rejectChange(entry_id)") Reject
-=======
-								.rp-entry-actions
->>>>>>> cb425e7dba4f0caa9629cc7f5c45b4a4992de609
 
 							div(ng-if="entry.type == 'comment'")
 								div(ng-repeat="comment in entry.thread", class="comment-thread__comment")

services/web/public/stylesheets/app/editor/review-panel.less

@@ -84,7 +84,8 @@
 	
 	.rp-entry-header {
 		display: flex;
-		padding: 5px;
+		align-items: center;
+		padding: 0 5px;
 	}
 		.rp-entry-action-icon {
 			font-size: @rp-icon-large-size;
@@ -92,15 +93,24 @@
 
 		.rp-entry-metadata {
 			flex-grow: 1;
+			padding: 0 5px;
+			line-height: 1.2;
 		}
+			.rp-entry-metadata-line {
+				margin: 0;
+			}
 
 		.rp-entry-avatar {
 
 		}
 
 	.rp-entry-body {
-
+		padding: 0 5px;
 	}
+		.rp-content-highlight {
+			color: @rp-type-darkgrey;
+			font-weight: @rp-semibold-weight;
+		}
 
 	.rp-entry-actions {