diff --git a/packages/common/src/scss/components/_BlockText.scss b/packages/common/src/scss/components/_BlockText.scss index 0dc9c48b..0a8ac28e 100644 --- a/packages/common/src/scss/components/_BlockText.scss +++ b/packages/common/src/scss/components/_BlockText.scss @@ -175,6 +175,18 @@ @apply mb-0; } } + &.-medium { + ul { + li { + &::before { + @apply mt-3; + @screen lg { + @apply mt-3.5; + } + } + } + } + } // other sizes &.-small { p { @@ -243,5 +255,15 @@ } } } + ul { + li { + &::before { + @apply mt-2.5; + @screen lg { + @apply mt-3; + } + } + } + } } } diff --git a/packages/vue/src/components/BaseAccordionItem/BaseAccordionItem.vue b/packages/vue/src/components/BaseAccordionItem/BaseAccordionItem.vue index 6ff3f9c5..0342da9a 100644 --- a/packages/vue/src/components/BaseAccordionItem/BaseAccordionItem.vue +++ b/packages/vue/src/components/BaseAccordionItem/BaseAccordionItem.vue @@ -3,6 +3,7 @@ import { computed, reactive, ref } from 'vue' import type { AccordionItemObject } from './../../interfaces.ts' import { uniqueId } from 'lodash' import IconPlus from './../Icons/IconPlus.vue' +import IconMinus from './../Icons/IconMinus.vue' export interface BaseAccordionItemProps { headingLevel?: string @@ -76,9 +77,9 @@ const emit = defineEmits(['accordionItemOpened', 'accordionItemClosed']) - + + diff --git a/packages/vue/src/components/SearchFilterGroup/SearchFilterGroup.vue b/packages/vue/src/components/SearchFilterGroup/SearchFilterGroup.vue index 657ed693..25a7cfa7 100644 --- a/packages/vue/src/components/SearchFilterGroup/SearchFilterGroup.vue +++ b/packages/vue/src/components/SearchFilterGroup/SearchFilterGroup.vue @@ -81,7 +81,8 @@
{{ prettyFilterNames(bucket.key_as_string ? bucket.key_as_string : bucket.key) }} - + ({{ bucket.doc_count.toLocaleString() }}) @@ -180,6 +182,12 @@ export default { subFilterAggKey: { type: String, default: undefined + }, + // force accordion styles and spacing even if there are no subfilters + // useful when mixing filters with and without subfilters together + styleAsAccordion: { + type: Boolean, + default: false } }, emits: ['update:filterBy'], diff --git a/packages/vue/src/components/SearchFilterGroupAccordionItem/SearchFilterGroupAccordionItem.vue b/packages/vue/src/components/SearchFilterGroupAccordionItem/SearchFilterGroupAccordionItem.vue index e1928f5e..fb07a6fe 100644 --- a/packages/vue/src/components/SearchFilterGroupAccordionItem/SearchFilterGroupAccordionItem.vue +++ b/packages/vue/src/components/SearchFilterGroupAccordionItem/SearchFilterGroupAccordionItem.vue @@ -2,6 +2,7 @@ import { computed, reactive, ref } from 'vue' import { uniqueId } from 'lodash' import IconPlus from './../Icons/IconPlus.vue' +import IconMinus from './../Icons/IconMinus.vue' export interface SearchFilterGroupAccordionItemProps { initOpen?: boolean @@ -57,10 +58,10 @@ const emit = defineEmits(['filterGroupAccordionItemOpened', 'filterGroupAccordio @click="handleClick()" > - + + diff --git a/packages/vue/src/components/SearchResultsList/SearchResultsList.vue b/packages/vue/src/components/SearchResultsList/SearchResultsList.vue index b6e3207b..9f6cf050 100644 --- a/packages/vue/src/components/SearchResultsList/SearchResultsList.vue +++ b/packages/vue/src/components/SearchResultsList/SearchResultsList.vue @@ -193,9 +193,11 @@ export default defineComponent({ page.id = page._id page.score = page._score // ensure router links + // TODO: issues with router links so disabling for now + // page.url = page._source.url + // ? page._source.url.replace(/^[^:]+:\/\/[^/?#]+/, '') + // : undefined page.url = page._source.url - ? page._source.url.replace(/^[^:]+:\/\/[^/?#]+/, '') - : undefined page.title = page._source.title page.type = pageType page.topic = topic diff --git a/packages/vue/src/templates/edu/PageEduStudentProject/PageEduStudentProject.vue b/packages/vue/src/templates/edu/PageEduStudentProject/PageEduStudentProject.vue index 0c803228..c81be0de 100644 --- a/packages/vue/src/templates/edu/PageEduStudentProject/PageEduStudentProject.vue +++ b/packages/vue/src/templates/edu/PageEduStudentProject/PageEduStudentProject.vue @@ -452,7 +452,8 @@ const computedClass = computed((): string => { ul { li { &::before { - @apply bg-secondary; + // intentionally using a specific red + @apply bg-jpl-red; } } }