Merge pull request #772 from sharelatex/as-fix-review-panel-style

Fix rich text toolbar throwing off track changes underlines
2026-05-27 02:51:57 +02:00 · 2018-07-18 08:43:11 +01:00
parent 1e7911adaf fba0cd04f5
commit fff8e37bc7
3 changed files with 3 additions and 7 deletions
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -1,4 +1,4 @@
-#review-panel
+#review-panel(style=showRichText ? "top: 32px" : "")
 	.rp-in-editor-widgets
 		a.rp-track-changes-indicator(
 			href
--- a/services/web/public/stylesheets/app/editor.less
+++ b/services/web/public/stylesheets/app/editor.less
@@ -93,6 +93,8 @@
 	height: @editor-toolbar-height;
 	background-color: @editor-toolbar-bg;
 	overflow: hidden;
+	position: relative;
+	z-index: 10; // Prevent track changes showing over toolbar
 }

 .loading-screen {
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -793,12 +793,6 @@
 	}
 }

-.toolbar-editor {
-	.rp-size-expanded & {
-		margin-right: @review-panel-width;
-	}
-}
-
 .rp-toggle {
 	display: inline-block;
 	vertical-align: middle;