소스 검색

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

Fix rich text toolbar throwing off track changes underlines
Alasdair Smith 8 년 전
부모
커밋
fff8e37bc7

+ 1 - 1
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
 	.rp-in-editor-widgets
 		a.rp-track-changes-indicator(
 		a.rp-track-changes-indicator(
 			href
 			href

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

@@ -93,6 +93,8 @@
 	height: @editor-toolbar-height;
 	height: @editor-toolbar-height;
 	background-color: @editor-toolbar-bg;
 	background-color: @editor-toolbar-bg;
 	overflow: hidden;
 	overflow: hidden;
+	position: relative;
+	z-index: 10; // Prevent track changes showing over toolbar
 }
 }
 
 
 .loading-screen {
 .loading-screen {

+ 0 - 6
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 {
 .rp-toggle {
 	display: inline-block;
 	display: inline-block;
 	vertical-align: middle;
 	vertical-align: middle;