Merge branch 'staging' into adjustContainerWidth

parameter1 · Dec 4, 2023 · b567c7d · b567c7d
2 parents 8a3884b + 798b9f9
commit b567c7d
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
@@ -80,6 +80,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)>
       <theme-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
@@ -508,4 +508,25 @@ label {
     margin-left: 0;
   }
 }
+
+.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/navigation.js b/sites/diverseeducation.com/config/navigation.js
@@ -19,9 +19,9 @@ const resources = [
   // { href: '/reports-data', label: 'Reports & Data' },
   // { href: '/from-the-magazine', label: 'From the Magazine' },
   { href: 'https://www.ccnewsnow.com', label: 'Community Colleges', target: '_blank' },
-  { href: 'https://www.divhealth.net', label: 'Health', target: '_blank' },
+  { href: '/health', label: 'Health' },
   { href: 'https://diversejobs.net', label: 'Jobs', target: '_blank' },
-  { href: 'https://www.diversemilitary.net', label: 'Military', target: '_blank' },
+  { href: '/military', label: 'Military' },
   { href: 'https://keepitreal.diverseeducation.com/', label: 'Keep it Real', target: '_blank' },
   { href: 'https://shop.diverseeducation.com/', label: 'Shop', target: '_blank' },
 ];