Merge branch 'staging' into master-10-18-2023

parameter1 · Oct 18, 2023 · ca27045 · ca27045
2 parents 5d4dbc3 + 3c528d0
commit ca27045
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 2 deletions.
diff --git a/packages/global/components/document.marko b/packages/global/components/document.marko
@@ -98,6 +98,7 @@ $ const omedaConfig = site.get('omeda');
       <global-site-header-2 has-user=hasUser reg-enabled=isEnabled />
       <global-site-menu has-user=hasUser reg-enabled=isEnabled />
     </marko-web-identity-x-context>
+
     <if(contentMeterState && !contentMeterState.isLoggedIn)>
       <global-content-meter-block
         views=contentMeterState.views

diff --git a/packages/global/config/user.js b/packages/global/config/user.js
@@ -0,0 +1,36 @@
+module.exports = {
+  items: [
+    {
+      href: '/user/login',
+      label: 'Sign In',
+      when: 'logged-out',
+      modifiers: ['user'],
+    },
+    {
+      href: '/user/logout',
+      label: 'Sign Out',
+      when: 'logged-in',
+      modifiers: ['user'],
+    },
+  ],
+  tools: [
+    {
+      href: '/user/login',
+      label: 'Sign In',
+      when: 'logged-out',
+      modifiers: ['user'],
+    },
+    {
+      href: '/user/profile',
+      label: 'Modify profile',
+      when: 'logged-in',
+      modifiers: ['user'],
+    },
+    {
+      href: '/user/logout',
+      label: 'Sign Out',
+      when: 'logged-in',
+      modifiers: ['user'],
+    },
+  ],
+};
diff --git a/packages/global/scss/core.scss b/packages/global/scss/core.scss
@@ -489,4 +489,25 @@ label {
   }
 
 }
+
+.site-navbar {
+  $self: &;
+  &__items--user {
+    font-size: 13px;
+    margin-top: initial;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    text-transform: initial;
+    a,
+    a:hover,
+    a:active,
+    a:visited {
+      color: $theme-site-navbar-primary-link-color;
+    }
+    @media (max-width: map-get($theme-site-header-breakpoints, hide-secondary)) {
+      display: none;
+    }
+  }
+}
 /*! critical:end */
diff --git a/sites/diverseeducation.com/config/site.js b/sites/diverseeducation.com/config/site.js
@@ -37,9 +37,9 @@ module.exports = {
   },
   logos: {
     navbar: {
-      src: 'https://img.diverseeducation.com/files/base/diverse/all/image/static/diverse-education-logo.png?h=60&auto=format,compress&q=70',
+      src: 'https://img.diverseeducation.com/files/base/diverse/all/image/static/DE-40year-anniversary.png?h=60&auto=format,compress&q=70',
       srcset: [
-        'https://img.diverseeducation.com/files/base/diverse/all/image/static/diverse-education-logo.png?h=60&auto=format,compress&q=70&dpr=2 2x',
+        'https://img.diverseeducation.com/files/base/diverse/all/image/static/DE-40year-anniversary.png?h=60&auto=format,compress&q=70&dpr=2 2x',
       ],
     },
     footer: {