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

More entry header styling + entry body.

Browse source
This commit is contained in:
Paulo Reis 2016-11-10 12:35:35 +00:00
parent 812ee82af1
commit 997addf355
2 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
services/web/app/views/project/editor/editor.jade
View file

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

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

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