diff --git a/packages/common/tailwind.colors.ts b/packages/common/tailwind.colors.ts index 99fa2209..ad43c517 100644 --- a/packages/common/tailwind.colors.ts +++ b/packages/common/tailwind.colors.ts @@ -217,6 +217,7 @@ export const ThemeWww = { export const ThemeEdu = { default: { '--color-primary': foundationColors['jpl-violet'], + '--color-primary-lighter': foundationColors['jpl-violet-lighter'], '--color-primary-light': foundationColors['jpl-violet-light'], '--color-primary-dark': foundationColors['jpl-violet-dark'], '--color-primary-darker': foundationColors['jpl-violet-darker'], @@ -231,6 +232,7 @@ export const ThemeEdu = { }, dark: { '--color-primary': foundationColors['jpl-violet-light'], + '--color-primary-lighter': foundationColors['jpl-violet-lighter'], '--color-primary-light': foundationColors['jpl-violet-light'], '--color-primary-dark': foundationColors['jpl-violet'], '--color-primary-darker': foundationColors['jpl-violet-dark'], @@ -245,6 +247,7 @@ export const ThemeEdu = { }, gray: { '--color-primary': foundationColors['jpl-violet-dark'], + '--color-primary-lighter': foundationColors['jpl-violet-light'], '--color-primary-light': foundationColors['jpl-violet'], '--color-primary-dark': foundationColors['jpl-violet-darker'], '--color-primary-darker': foundationColors['jpl-violet-darker'], @@ -262,6 +265,7 @@ export const ThemeEdu = { export const ThemeInternal = { default: { '--color-primary': foundationColors['jpl-teal'], + '--color-primary-lighter': foundationColors['jpl-teal-lighter'], '--color-primary-light': foundationColors['jpl-teal-light'], '--color-primary-dark': foundationColors['jpl-teal-dark'], '--color-primary-darker': foundationColors['jpl-teal-darker'], @@ -276,6 +280,7 @@ export const ThemeInternal = { }, dark: { '--color-primary': foundationColors['jpl-teal-light'], + '--color-primary-lighter': foundationColors['jpl-teal-lighter'], '--color-primary-light': foundationColors['jpl-teal-light'], '--color-primary-dark': foundationColors['jpl-teal'], '--color-primary-darker': foundationColors['jpl-teal-dark'], @@ -290,6 +295,7 @@ export const ThemeInternal = { }, gray: { '--color-primary': foundationColors['jpl-teal-dark'], + '--color-primary-lighter': foundationColors['jpl-teal-light'], '--color-primary-light': foundationColors['jpl-teal'], '--color-primary-dark': foundationColors['jpl-teal-darker'], '--color-primary-darker': foundationColors['jpl-teal-darker'], diff --git a/packages/vue/src/components/NavDesktop/NavDesktopDropdown.vue b/packages/vue/src/components/NavDesktop/NavDesktopDropdown.vue index 76bda750..4ba2523a 100644 --- a/packages/vue/src/components/NavDesktop/NavDesktopDropdown.vue +++ b/packages/vue/src/components/NavDesktop/NavDesktopDropdown.vue @@ -3,7 +3,7 @@ -
- Education +
+ + Education +
* { @apply text-white; - - .NavDesktopDropdown > button { - // mimics .text-contrast class - text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.7); - } } } } diff --git a/packages/vue/src/components/NavHeading/NavHeading.stories.js b/packages/vue/src/components/NavHeading/NavHeading.stories.js index ee0645de..d870b32f 100644 --- a/packages/vue/src/components/NavHeading/NavHeading.stories.js +++ b/packages/vue/src/components/NavHeading/NavHeading.stories.js @@ -6,7 +6,7 @@ export default { component: NavHeading, decorators: [ () => ({ - template: `
` + template: `
` }) ], parameters: { diff --git a/packages/vue/src/components/NavHeading/NavHeading.vue b/packages/vue/src/components/NavHeading/NavHeading.vue index fb04a9e8..b8aaafa5 100644 --- a/packages/vue/src/components/NavHeading/NavHeading.vue +++ b/packages/vue/src/components/NavHeading/NavHeading.vue @@ -7,7 +7,7 @@ {{ data.heading }} diff --git a/packages/vue/src/components/NavLinkList/NavLinkList.vue b/packages/vue/src/components/NavLinkList/NavLinkList.vue index 8e619dea..42c8e891 100644 --- a/packages/vue/src/components/NavLinkList/NavLinkList.vue +++ b/packages/vue/src/components/NavLinkList/NavLinkList.vue @@ -12,7 +12,7 @@ > +
+
@@ -180,6 +192,7 @@ import { defineComponent } from 'vue' import { mapStores } from 'pinia' import { useThemeStore } from './../../store/theme' import { mixinGetRouterLink, mixinGetLinkText } from './../../utils/mixins' +import IconExternal from './../Icons/IconExternal.vue' import BaseLink from './../BaseLink/BaseLink.vue' import BaseButton from './../BaseButton/BaseButton.vue' import NavSocial from './../NavSocial/NavSocial.vue' @@ -193,7 +206,8 @@ export default defineComponent({ BaseButton, NavSocial, TheFooterSignUp, - LogoCaltech + LogoCaltech, + IconExternal }, props: { data: {