diff --git a/packages/common/src/scss/components/_BlockText.scss b/packages/common/src/scss/components/_BlockText.scss index e27558c8..1d3ea01d 100644 --- a/packages/common/src/scss/components/_BlockText.scss +++ b/packages/common/src/scss/components/_BlockText.scss @@ -76,6 +76,15 @@ ol { @apply pl-12 list-decimal; + ol { + list-style-type: lower-alpha; + ol { + list-style-type: lower-roman; + ol { + list-style-type: decimal; + } + } + } } ul { diff --git a/packages/vue/src/components/BlockHeading/BlockHeading.vue b/packages/vue/src/components/BlockHeading/BlockHeading.vue index 254d6682..edc91f3b 100644 --- a/packages/vue/src/components/BlockHeading/BlockHeading.vue +++ b/packages/vue/src/components/BlockHeading/BlockHeading.vue @@ -55,7 +55,7 @@ export default defineComponent({ &:target { @apply scroll-mt-14; @screen lg { - @apply scroll-mt-20; + @apply scroll-mt-[8rem]; } } } diff --git a/packages/vue/src/templates/edu/PageEduLesson/PageEduLesson.stories.js b/packages/vue/src/templates/edu/PageEduLesson/PageEduLesson.stories.js index af701e5b..28b3cf70 100644 --- a/packages/vue/src/templates/edu/PageEduLesson/PageEduLesson.stories.js +++ b/packages/vue/src/templates/edu/PageEduLesson/PageEduLesson.stories.js @@ -164,7 +164,14 @@ export const BaseStory = { management: BlockStreamfieldMinimalData.body, managementHeading: 'Management stuff', - background: BlockStreamfieldMinimalData.body, + background: [ + ...BlockStreamfieldMinimalData.body, + { + blockType: 'RichTextBlock', + value: + '
  1. A list
    1. A nested list should be a.
      1. Another nested should be i.
        1. Another is a number again.
' + } + ], backgroundHeading: 'Background heading', procedures: [ @@ -173,7 +180,15 @@ export const BaseStory = { stepsNumbering: true, steps: [ { - blocks: BlockStreamfieldMinimalData.body + blocks: [ + ...BlockStreamfieldMinimalData.body, + + { + blockType: 'RichTextBlock', + value: + '
  1. A list
    1. A nested list should be a.
      1. Another nested should be i.
        1. Another is a number again.
' + } + ] }, { blocks: BlockStreamfieldMinimalData.body diff --git a/packages/vue/src/templates/edu/PageEduLesson/PageEduLesson.vue b/packages/vue/src/templates/edu/PageEduLesson/PageEduLesson.vue index 407a01dc..86d53bd2 100644 --- a/packages/vue/src/templates/edu/PageEduLesson/PageEduLesson.vue +++ b/packages/vue/src/templates/edu/PageEduLesson/PageEduLesson.vue @@ -231,8 +231,7 @@ const consolidatedSections = computed((): EduLessonSectionObject[] => { : undefined, blocks: section !== 'materials' && section !== 'procedures' ? data[section] : undefined, text: section === 'materials' ? data[section] : undefined, - procedures: section === 'procedures' ? data[section] : undefined, - procedureSteps: section === 'procedures' ? data.proceduresStepsNumbering : false + procedures: section === 'procedures' ? data[section] : undefined }) } // include custom "after_" sections @@ -333,18 +332,20 @@ const consolidatedSections = computed((): EduLessonSectionObject[] => { v-for="(value, _key) in consolidatedSections" :key="_key" > - - + diff --git a/packages/vue/src/utils/mixins.ts b/packages/vue/src/utils/mixins.ts index 9707130d..1dc160bc 100644 --- a/packages/vue/src/utils/mixins.ts +++ b/packages/vue/src/utils/mixins.ts @@ -148,19 +148,21 @@ export const mixinHighlightPrimary = (value: boolean) => { Useful for dropdown toggles. */ export const mixinIsActivePath = (itemPath: string): Boolean => { - const route = useRoute() - const currentPath = route ? route.path : false - const path = itemPath.startsWith('http') ? itemPath.replace(/^.*\/\/[^/]+/, '') : itemPath - const ancestorPath = path ? (path.endsWith('/') ? path : path + '/') : false + if (itemPath) { + const route = useRoute() + const currentPath = route ? route.path : false + const path = itemPath.startsWith('http') ? itemPath.replace(/^.*\/\/[^/]+/, '') : itemPath + const ancestorPath = path ? (path.endsWith('/') ? path : path + '/') : false - if (currentPath && path && ancestorPath) { - if (currentPath === path) { - return true - } else if (currentPath.startsWith('/edu/events')) { - // special treatment since EDU combines News & Events in the main nav - return path.startsWith('/edu/news') - } else { - return currentPath.startsWith(ancestorPath) + if (currentPath && path && ancestorPath) { + if (currentPath === path) { + return true + } else if (currentPath.startsWith('/edu/events')) { + // special treatment since EDU combines News & Events in the main nav + return path.startsWith('/edu/news') + } else { + return currentPath.startsWith(ancestorPath) + } } } return false