diff --git a/services/web/app/src/router.js b/services/web/app/src/router.js index 1643fa7f38..b2362e4db5 100644 --- a/services/web/app/src/router.js +++ b/services/web/app/src/router.js @@ -80,10 +80,7 @@ function initialize(webRouter, privateApiRouter, publicApiRouter) { webRouter.get( '*', expressify( - SplitTestMiddleware.loadAssignmentsInLocals([ - 'unified-navigation', - 'design-system-updates', - ]) + SplitTestMiddleware.loadAssignmentsInLocals(['design-system-updates']) ) ) diff --git a/services/web/app/views/layout/navbar-marketing.pug b/services/web/app/views/layout/navbar-marketing.pug index 5f23cd1f83..1ff1aea58e 100644 --- a/services/web/app/views/layout/navbar-marketing.pug +++ b/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())) diff --git a/services/web/app/views/layout/navbar.pug b/services/web/app/views/layout/navbar.pug index 6019af8f65..7f2ed8ca89 100644 --- a/services/web/app/views/layout/navbar.pug +++ b/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())) diff --git a/services/web/frontend/stylesheets/app/content_page.less b/services/web/frontend/stylesheets/app/content_page.less index d6f7d07f30..ebe6f23748 100644 --- a/services/web/frontend/stylesheets/app/content_page.less +++ b/services/web/frontend/stylesheets/app/content_page.less @@ -47,7 +47,7 @@ } .page-header { - margin-top: 60px; + margin-top: 0px; } /* diff --git a/services/web/frontend/stylesheets/core/page.less b/services/web/frontend/stylesheets/core/page.less index 5377e90615..6859ee2d0b 100644 --- a/services/web/frontend/stylesheets/core/page.less +++ b/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; }