Merge pull request #3498 from overleaf/as-remove-brand-prefix

Remove brandPrefix setting

GitOrigin-RevId: f415d10e81b79d35159000e554b9174304f5a41b

services/web/app/src/infrastructure/ExpressLocals.js

@@ -148,12 +148,8 @@ module.exports = function(webRouter, privateApiRouter, publicApiRouter) {
       }
     }
 
-    function _buildCssFileName(themeModifier) {
-      return `${Settings.brandPrefix}${themeModifier || ''}style.css`
-    }
-
-    res.locals.buildCssPath = function(themeModifier) {
-      const cssFileName = _buildCssFileName(themeModifier)
+    res.locals.buildCssPath = function(themeModifier = '') {
+      const cssFileName = `${themeModifier}style.css`
 
       let path
       if (IS_DEV_ENV) {

services/web/app/views/_metadata.pug

@@ -109,7 +109,7 @@ if settings.robotsNoindex
 
 
 //- 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" : "#138A07")
+link(rel="icon", href="/favicon.ico")
+link(rel="icon", sizes="192x192", href="/touch-icon-192x192.png")
+link(rel="apple-touch-icon-precomposed", href="/apple-touch-icon-precomposed.png")
+link(rel="mask-icon", href="/mask-favicon.svg", color="#138A07")

services/web/app/views/general/400.pug

@@ -2,7 +2,7 @@ doctype html
 html.full-height(itemscope, itemtype='http://schema.org/Product')
 	head
 		title Something went wrong
-		link(rel="icon", href="/" + settings.brandPrefix + "favicon.ico")
+		link(rel="icon", href="/favicon.ico")
 		if buildCssPath
 			link(rel="stylesheet", href=buildCssPath(null, { hashedPath: true }))
 

services/web/app/views/general/500.pug

@@ -2,7 +2,7 @@ doctype html
 html.full-height(itemscope, itemtype='http://schema.org/Product')
 	head
 		title Something went wrong
-		link(rel="icon", href="/" + settings.brandPrefix + "favicon.ico")
+		link(rel="icon", href="/favicon.ico")
 		if buildCssPath
 			link(rel="stylesheet", href=buildCssPath(null, { hashedPath: true }))
 

services/web/config/settings.defaults.coffee

@@ -523,8 +523,6 @@ module.exports = settings =
 
 	statusPageUrl: process.env['OVERLEAF_STATUS_URL'] or "status.overleaf.com"
 
-	brandPrefix: process.env['BRAND_PREFIX'] or "sl-" # Set to 'ol-' for overleaf styles
-
 	nav:
 		title: "ShareLaTeX Community Edition"