Răsfoiți Sursa

Merge pull request #1544 from sharelatex/pr-fix-sl-history-toolbar

Show the toolbar in SL history projects.

GitOrigin-RevId: ea268638c4ccfd2439a624fc10966f9b9c9ae86b
Paulo Jorge Reis 7 ani în urmă
părinte
comite
46c6d11574

+ 1 - 1
services/web/app/views/project/editor/history/previewPanelV2.pug

@@ -5,7 +5,7 @@
 		ng-if="!!history.selection.diff && !history.selection.diff.loading && !history.selection.diff.error",
 		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"
 			ace-editor="history",
 			theme="settings.editorTheme",

+ 8 - 2
services/web/public/stylesheets/app/editor/history.less

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