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

Merge + basic layout for entries.

Browse source
This commit is contained in:
Paulo Reis 2016-11-09 16:36:06 +00:00
parent b44f1cde10
commit 341a092231
2 changed files with 49 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,6 +60,9 @@ div.full-size(
div.small(style="color: hsl({{ users[entry.metadata.user_id].hue }}, 70%, 50%)") {{ users[entry.metadata.user_id].name }} div.small(style="color: hsl({{ users[entry.metadata.user_id].hue }}, 70%, 50%)") {{ users[entry.metadata.user_id].name }}
div.small {{ entry.metadata.ts }} div.small {{ entry.metadata.ts }}
| {{ entry.content }} | {{ entry.content }}
.review-entry-body
{{ entry.content }}
.review-entry-actions
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")
div.small {{ comment.ts }} div.small {{ comment.ts }}

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

@ -1,20 +1,23 @@
@rp-bg-blue : #dadfed; @rp-base-font-size : 12px;
@rp-bg-dim-blue : #fafafa;
@rp-highlight-blue : #8a96b5;
@rp-border-grey : #d9d9d9; @rp-bg-blue : #dadfed;
@rp-bg-dim-blue : #fafafa;
@rp-highlight-blue : #8a96b5;
@rp-green : #2c8e30; @rp-border-grey : #d9d9d9;
@rp-dim-green : #cae3cb;
@rp-red : #c5060b;
@rp-dim-red : #f3cdce;
@rp-yellow : #f3b111;
@rp-dim-yellow : #ffe9b2;
@rp-type-blue : #6b7797; @rp-green : #2c8e30;
@rp-type-darkgrey : #3f3f3f; @rp-dim-green : #cae3cb;
@rp-red : #c5060b;
@rp-dim-red : #f3cdce;
@rp-yellow : #f3b111;
@rp-dim-yellow : #ffe9b2;
@review-panel-width : 230px; @rp-type-blue : #6b7797;
@rp-type-darkgrey : #3f3f3f;
@rp-entry-ribbon-width : 4px;
@review-panel-width : 230px;
#review-panel { #review-panel {
position: absolute; position: absolute;
@ -26,6 +29,8 @@
border-left: solid 1px @rp-border-grey; border-left: solid 1px @rp-border-grey;
overflow: hidden; overflow: hidden;
display: none; display: none;
font-size: @rp-base-font-size;
color: @rp-type-blue;
} }
.review-panel-toolbar { .review-panel-toolbar {
@ -58,9 +63,8 @@
.review-entry { .review-entry {
position: absolute; position: absolute;
font-size: 12px; padding-left: @rp-entry-ribbon-width;
padding: 5px 5px 5px 9px; border-left: solid @rp-entry-ribbon-width transparent;
border-left: solid 4px transparent;
border-radius: 3px; border-radius: 3px;
margin: 0 6px; margin: 0 6px;
background-color: #FFF; background-color: #FFF;
@ -75,6 +79,32 @@
border-left-color: @rp-red; border-left-color: @rp-red;
} }
} }
.review-entry-header {
display: flex;
&-action-icon {
}
&-metadata {
flex-grow: 1;
}
&-avatar {
}
}
.review-entry-body {
}
.review-entry-actions {
}
.has-review-panel { .has-review-panel {
#editor { #editor {