Merge pull request #10830 from overleaf/jel-remove-test-show-unified-navigation

[web] Remove `unified-navigation` references in code

GitOrigin-RevId: bbcea3c8013936a8e5eaed18e6121344a3c05e9a

services/web/app/src/router.js

@@ -80,10 +80,7 @@ function initialize(webRouter, privateApiRouter, publicApiRouter) {
   webRouter.get(
     '*',
     expressify(
-      SplitTestMiddleware.loadAssignmentsInLocals([
+      SplitTestMiddleware.loadAssignmentsInLocals(['design-system-updates'])
-        'unified-navigation',
-        'design-system-updates',
-      ])
     )
   )
 

services/web/app/views/layout/navbar-marketing.pug

@@ -63,7 +63,7 @@ nav.navbar.navbar-default.navbar-main
 										a(href="/admin/survey") Manage Surveys
 
 					// loop over header_extras
-					each item in ((splitTestVariants && (splitTestVariants['unified-navigation'] === 'show-unified-navigation')) ? nav.header_extras_unified : nav.header_extras)
+					each item in nav.header_extras
 						-
 							if ((item.only_when_logged_in && getSessionUser())
 											|| (item.only_when_logged_out && (!getSessionUser()))

services/web/app/views/layout/navbar.pug

@@ -45,7 +45,7 @@ nav.navbar.navbar-default.navbar-main
 										a(href="/admin/survey") Manage Surveys
 
 					// loop over header_extras
-					each item in ((splitTestVariants && (splitTestVariants['unified-navigation'] === 'show-unified-navigation')) ? nav.header_extras_unified : nav.header_extras)
+					each item in nav.header_extras
 						-
 							if ((item.only_when_logged_in && getSessionUser())
 								|| (item.only_when_logged_out && (!getSessionUser()))

services/web/frontend/stylesheets/app/content_page.less

@@ -47,7 +47,7 @@
   }
 
   .page-header {
-    margin-top: 60px;
+    margin-top: 0px;
   }
 
   /*

services/web/frontend/stylesheets/core/page.less

@@ -8,6 +8,7 @@
   .page-header {
     border-bottom: none;
     margin: 0;
+    margin-top: 60px !important;
     padding: 0;
     text-align: center;
   }