Merge pull request #1662 from sharelatex/as-fix-wrong-favicon

Fix missed favicon path update and make track-changes page inherit from layout

GitOrigin-RevId: e702b965b7445d86193b3b914d40d91a9a3345e3

services/web/app/views/_metadata.pug

@@ -95,3 +95,9 @@ meta(name="twitter:card", content=metadata && metadata.twitterCardType ? metadat
 //- Viewport
 if metadata && metadata.viewport
 	meta(name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes")
+
+//- Icons
+link(rel="icon", href="/" + settings.brandPrefix + "favicon.ico")
+link(rel="icon", sizes="192x192", href="/" + settings.brandPrefix + "touch-icon-192x192.png")
+link(rel="apple-touch-icon-precomposed", href="/" + settings.brandPrefix + "apple-touch-icon-precomposed.png")
+link(rel="mask-icon", href="/" + settings.brandPrefix + "mask-favicon.svg", color=settings.brandPrefix === 'sl-' ? "#a93529" : "#4f9c45")

services/web/app/views/layout.pug

@@ -18,12 +18,6 @@ html(
 		-if (typeof(gaExperiments) != "undefined")
 			|!{gaExperiments}
 
-		//- Icons
-		link(rel="icon", href="/" + settings.brandPrefix + "favicon.ico")
-		link(rel="icon", sizes="192x192", href="/" + settings.brandPrefix + "touch-icon-192x192.png")
-		link(rel="apple-touch-icon-precomposed", href="/" + settings.brandPrefix + "apple-touch-icon-precomposed.png")
-		link(rel="mask-icon", href="/" + settings.brandPrefix + "mask-favicon.svg", color=settings.brandPrefix === 'ol-' ? "#4f9c45" : "#a93529")
-
 		//- Stylesheet
 		link(rel='stylesheet', href=buildCssPath(getCssThemeModifier(userSettings, brandVariation), { hashedPath: true }), id="main-stylesheet")