github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-04-15 10:06:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes

Browse source
This commit is contained in:
James Allen 2017-01-18 14:07:29 +01:00
commit f97d36eb73
4 changed files with 56 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,6 +58,15 @@ div.full-size(
doc-id="editor.open_doc_id"
renderer-data="reviewPanel.rendererData"
)
a.rp-track-changes-indicator(
href
ng-if="editor.wantTrackChanges"
ng-click="toggleReviewPanel();"
ng-class="{ 'rp-track-changes-indicator-on-dark' : darkTheme }"
) Track changes is
strong on
include ./review-panel

7
services/web/public/coffee/ide/review-panel/directives/changeEntry.coffee
View file

@ -13,10 +13,13 @@ define [
onIndicatorClick: "&"
link: (scope, element, attrs) ->
scope.contentLimit = 40
scope.needsCollapsing = scope.entry.content.length > scope.contentLimit
scope.isCollapsed = true
scope.needsCollapsing = false
scope.toggleCollapse = () ->
scope.isCollapsed = !scope.isCollapsed
$timeout () ->
scope.$emit "review-panel:layout"
scope.$emit "review-panel:layout"
scope.$watch "entry.content.length", (contentLength) ->
scope.needsCollapsing = contentLength > scope.contentLimit

7
services/web/public/coffee/ide/review-panel/directives/resolvedCommentEntry.coffee
View file

@ -11,10 +11,11 @@ define [
onDelete: "&"
link: (scope, element, attrs) ->
scope.contentLimit = 40
scope.needsCollapsing = scope.thread.content.length > scope.contentLimit
scope.needsCollapsing = false
scope.isCollapsed = true
scope.toggleCollapse = () ->
scope.isCollapsed = !scope.isCollapsed
$timeout () ->
scope.$emit "review-panel:layout"
scope.$watch "thread.content.length", (contentLength) ->
scope.needsCollapsing = contentLength > scope.contentLimit

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

@ -827,4 +827,41 @@
color: darken(@rp-type-blue, 5%);
text-decoration: none;
}
}
}
.rp-track-changes-indicator {
display: none;
position: absolute;
top: 0;
right: @review-off-width;
padding: 5px 10px;
background-color: rgba(240, 240, 240, 0.9);
color: @rp-type-blue;
text-align: center;
border-bottom-left-radius: 3px;
font-size: 10px;
z-index: 2;
&.rp-track-changes-indicator-on-dark {
background-color: rgba(88, 88, 88, .8);
color: #FFF;
&:hover,
&:focus {
background-color: rgba(88, 88, 88, 1);
color: #FFF;
}
}
&:hover,
&:focus {
outline: 0;
text-decoration: none;
background-color: rgba(240, 240, 240, 1);
color: @rp-type-blue;
}
.rp-size-mini & {
display: block;
}
}