github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel

Browse source
This commit is contained in:
James Allen 2016-11-21 15:19:02 +00:00
commit d77c385cf0
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/web/app/views/project/editor/review-panel.jade
View file

@ -110,9 +110,9 @@ script(type='text/ng-template', id='changeEntryTemplate')
i.fa.fa-pencil(ng-switch-when="insert") i.fa.fa-pencil(ng-switch-when="insert")
i.rp-icon-delete(ng-switch-when="delete") i.rp-icon-delete(ng-switch-when="delete")
.rp-entry-metadata .rp-entry-metadata
p.rp-entry-metadata-line(style="color: hsl({{ user.hue }}, 70%, 50%);") {{ user.name }} p.rp-entry-metadata-line(style="color: hsl({{ user.hue }}, 70%, 40%);") {{ user.name }}
p.rp-entry-metadata-line {{ entry.metadata.ts | date : 'MMM d, y h:mm a' }} p.rp-entry-metadata-line {{ entry.metadata.ts | date : 'MMM d, y h:mm a' }}
.rp-avatar(style="background-color: hsl({{ user.hue }}, 70%, 50%);") {{ user.avatar_text }} .rp-avatar(style="background-color: hsl({{ user.hue }}, 70%, 50%);") {{ user.avatar_text | limitTo : 1 }}
.rp-entry-body(ng-switch="entry.type") .rp-entry-body(ng-switch="entry.type")
span(ng-switch-when="insert") Added  span(ng-switch-when="insert") Added 
ins.rp-content-highlight {{ entry.content }} ins.rp-content-highlight {{ entry.content }}
@ -145,7 +145,7 @@ script(type='text/ng-template', id='commentEntryTemplate')
.rp-avatar( .rp-avatar(
ng-if="!users[comment.user_id].isSelf;" ng-if="!users[comment.user_id].isSelf;"
style="background-color: hsl({{ users[comment.user_id].hue }}, 70%, 50%);" style="background-color: hsl({{ users[comment.user_id].hue }}, 70%, 50%);"
) {{ users[comment.user_id].avatar_text }} ) {{ users[comment.user_id].avatar_text | limitTo : 1 }}
.rp-comment-body(style="color: hsl({{ users[comment.user_id].hue }}, 70%, 90%);") .rp-comment-body(style="color: hsl({{ users[comment.user_id].hue }}, 70%, 90%);")
p.rp-comment-content {{ comment.content }} p.rp-comment-content {{ comment.content }}
p.rp-comment-metadata p.rp-comment-metadata

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

@ -386,6 +386,10 @@
.rp-comment-resolved-description { .rp-comment-resolved-description {
padding: 5px; padding: 5px;
.rp-state-overview & {
padding: 0px;
}
} }
.rp-add-comment-btn { .rp-add-comment-btn {