Sfoglia il codice sorgente

Add i18n; update the review icon image.

Paulo Reis 8 anni fa
parent
commit
64c29787c0

+ 2 - 2
services/web/app/views/project/editor/left-menu.pug

@@ -131,7 +131,7 @@ aside#left-menu.full-size(
 				)
 
 			.form-controls
-				label(for="editorTheme") #{translate("theme")}
+				label(for="editorTheme") #{translate("editor_theme")}
 				select(
 					name="editorTheme"
 					ng-model="settings.editorTheme"
@@ -141,7 +141,7 @@ aside#left-menu.full-size(
 
 			- if (settings.overleaf != null)
 				.form-controls
-					label(for="overallTheme") overall theme
+					label(for="overallTheme") #{translate("overall_theme")}
 					select(
 						name="overallTheme"
 						ng-model="settings.overallTheme"

+ 0 - 1
services/web/public/coffee/ide/editor/directives/aceEditor/highlights/HighlightsManager.coffee

@@ -28,7 +28,6 @@ define [
 				@redrawAnnotations()
 
 			@$scope.$watch "theme", (value) =>
-				console.log value
 				@redrawAnnotations()
 
 			@editor.on "mousemove", (e) =>

BIN
services/web/public/img/review-icon-sprite-ol.png


BIN
services/web/public/img/review-icon-sprite-ol@2x.png


+ 9 - 0
services/web/public/stylesheets/app/editor/review-panel.less

@@ -949,6 +949,7 @@
 	display: inline-block;
 	background: url('/img/review-icon-sprite-ol.png') top/30px no-repeat;
 	width: 30px;
+	background-position-y: -30px;
 
 	&::before {
 		content: '\00a0'; // Non-breakable space. A non-breakable character here makes this icon work like font-awesome.
@@ -959,6 +960,14 @@
 	}
 }
 
+.review-icon when (@is-overleaf-light = true) {
+	background-position-y: 0;
+	.toolbar .btn-full-height.active &,
+	.toolbar .btn-full-height:active & {
+		background-position-y: -30px;
+	}
+}
+
 .resolved-comments-toggle {
 	font-size: 14px;
 	color: lighten(@rp-type-blue, 25%);