From 013df171920d7f3186d3eef9a5c0277ac01ad21d Mon Sep 17 00:00:00 2001 From: Paulo Reis Date: Wed, 9 Nov 2016 17:09:57 +0000 Subject: [PATCH] Entry header layout. --- services/web/app/views/project/editor/editor.jade | 11 +++++++---- .../public/stylesheets/app/editor/review-panel.less | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/services/web/app/views/project/editor/editor.jade b/services/web/app/views/project/editor/editor.jade index 81be20f3c9..fa7f2b35c1 100644 --- a/services/web/app/views/project/editor/editor.jade +++ b/services/web/app/views/project/editor/editor.jade @@ -56,13 +56,16 @@ div.full-size( ng-style="{'top': top}" ) div(ng-if="entry.type == 'insert' || entry.type == 'delete'") - div(style="float: right; background-color: hsl({{ users[entry.metadata.user_id].hue }}, 70%, 50%); width: 40px; height: 40px;") {{ users[entry.metadata.user_id].avatar_text }} - div.small(style="color: hsl({{ users[entry.metadata.user_id].hue }}, 70%, 50%)") {{ users[entry.metadata.user_id].name }} - div.small {{ entry.metadata.ts }} - | {{ entry.content }} + .review-entry-header + .review-entry-header-action-icon + + .review-entry-header-metadata + {{ users[entry.metadata.user_id].name }} {{ entry.metadata.ts }} + .review-entry-header-avatar(style="background-color: hsl({{ users[entry.metadata.user_id].hue }}, 70%, 50%);") {{ users[entry.metadata.user_id].avatar_text }} .review-entry-body {{ entry.content }} .review-entry-actions + div(ng-if="entry.type == 'comment'") div(ng-repeat="comment in entry.thread", class="comment-thread__comment") div.small(style="color: hsl({{ users[comment.user_id].hue }}, 70%, 50%)") {{ users[comment.user_id].name }} diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less index 8ff9e93f7d..88f9ac2a97 100644 --- a/services/web/public/stylesheets/app/editor/review-panel.less +++ b/services/web/public/stylesheets/app/editor/review-panel.less @@ -68,7 +68,7 @@ border-radius: 3px; margin: 0 6px; background-color: #FFF; - max-width: 148px; + max-width: 248px; word-wrap: break-word; &-insert { @@ -82,7 +82,7 @@ .review-entry-header { display: flex; - + &-action-icon { }