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 pull request #1544 from sharelatex/pr-fix-sl-history-toolbar

Browse source 
Show the toolbar in SL history projects.

GitOrigin-RevId: ea268638c4ccfd2439a624fc10966f9b9c9ae86b
This commit is contained in:
Paulo Jorge Reis 2019-02-27 10:26:15 +00:00 committed by James Allen
parent e4153ae3e4
commit 46c6d11574
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/project/editor/history/previewPanelV2.pug
View file

@ -5,7 +5,7 @@
ng-if="!!history.selection.diff && !history.selection.diff.loading && !history.selection.diff.error", ng-if="!!history.selection.diff && !history.selection.diff.loading && !history.selection.diff.error",
ng-class="{ 'diff-binary': history.selection.diff.binary }" ng-class="{ 'diff-binary': history.selection.diff.binary }"
) )
.diff-editor.hide-ace-cursor( .diff-editor-v2.hide-ace-cursor(
ng-if="!history.selection.diff.binary" ng-if="!history.selection.diff.binary"
ace-editor="history", ace-editor="history",
theme="settings.editorTheme", theme="settings.editorTheme",

12
services/web/public/stylesheets/app/editor/history.less
View file

@ -8,6 +8,8 @@
@range-bar-color: @link-color; @range-bar-color: @link-color;
@range-bar-selected-offset: 14px; @range-bar-selected-offset: 14px;
@history-toolbar-height: 32px;
#history { #history {
.upgrade-prompt { .upgrade-prompt {
position: absolute; position: absolute;
@ -50,17 +52,21 @@
.full-size; .full-size;
.toolbar { .toolbar {
padding: 3px; padding: 3px;
height: 32px; height: @history-toolbar-height;
.name { .name {
color: #FFF;
float: left; float: left;
padding: 3px @line-height-computed / 4; padding: 3px @line-height-computed / 4;
display: inline-block; display: inline-block;
} }
} }
.diff-editor { .diff-editor-v2 {
.full-size; .full-size;
} }
.diff-editor {
.full-size;
top: @history-toolbar-height;
}
.diff-deleted { .diff-deleted {
padding: @line-height-computed; padding: @line-height-computed;
} }