diff --git a/package-lock.json b/package-lock.json index 19e3798..6c4f8ef 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ "@sealcode/add-to-head": "^1.0.0", "@sealcode/file-manager": "^1.0.2", "@sealcode/jdd": "^0.8.6", - "@sealcode/jdd-editor": "^0.2.20", + "@sealcode/jdd-editor": "^0.2.21", "@sealcode/monaco-wrapper": "^0.0.4", "@sealcode/sealgen": "^0.19.20", "@sealcode/show-first-row": "^0.1.0", @@ -962,9 +962,9 @@ } }, "node_modules/@sealcode/jdd-editor": { - "version": "0.2.20", - "resolved": "https://registry.npmjs.org/@sealcode/jdd-editor/-/jdd-editor-0.2.20.tgz", - "integrity": "sha512-FKNolZ0JFigTrv0DhiBPlLwg14IHadlyA0mZ48dmy9Az4Oh7XymlxuvXYmhanFT58+eJbR3xqhXCnm1WE7tpgw==", + "version": "0.2.22", + "resolved": "https://registry.npmjs.org/@sealcode/jdd-editor/-/jdd-editor-0.2.22.tgz", + "integrity": "sha512-vf4C2xwuE2hYta9C6yJAsq8/Olk0p+9galqaI2+aKwP72k/WALsvBeMKWG88SGWWXVizNDM591M+lPkHEr/5tA==", "dependencies": { "@koa/router": "^13.1.0", "@sealcode/jdd": "^0.8.6", diff --git a/package.json b/package.json index 51a1c17..7e48564 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "@sealcode/add-to-head": "^1.0.0", "@sealcode/file-manager": "^1.0.2", "@sealcode/jdd": "^0.8.6", - "@sealcode/jdd-editor": "^0.2.20", + "@sealcode/jdd-editor": "^0.2.21", "@sealcode/monaco-wrapper": "^0.0.4", "@sealcode/sealgen": "^0.19.20", "@sealcode/show-first-row": "^0.1.0", diff --git a/src/back/html.tsx b/src/back/html.tsx index bc282c5..beac00b 100644 --- a/src/back/html.tsx +++ b/src/back/html.tsx @@ -65,7 +65,7 @@ export default function html({ ${classes ? `class="${classes}"` : ""} > ${!hideNavigation ? (htmlOptions?.navbar || default_navbar)(ctx) : ""} - ${body} ${footer(ctx)} + ${body} ${htmlOptions?.showFooter ? footer(ctx) : ""} `; } diff --git a/src/back/jdd-components/faq-component/faq-component.css b/src/back/jdd-components/faq-component/faq-component.css index af8fbdc..f3f7f56 100644 --- a/src/back/jdd-components/faq-component/faq-component.css +++ b/src/back/jdd-components/faq-component/faq-component.css @@ -1,3 +1,4 @@ +/* stylelint-disable no-descending-specificity */ .faq-component { display: flex; justify-content: center; @@ -73,11 +74,19 @@ &.question-container--accent { background-color: var(--color-brand-accent); color: var(--color-brand-text-on-accent); + + a { + color: var(--color-brand-link-on-accent); + } } &.question-container--accent2 { background-color: var(--color-brand-accent2); color: var(--color-brand-text-on-accent2); + + a { + color: var(--color-brand-link-on-accent2); + } } } diff --git a/src/back/jdd-components/faq-component/faq-component.jdd.tsx b/src/back/jdd-components/faq-component/faq-component.jdd.tsx index c852d83..12940fa 100644 --- a/src/back/jdd-components/faq-component/faq-component.jdd.tsx +++ b/src/back/jdd-components/faq-component/faq-component.jdd.tsx @@ -29,13 +29,14 @@ export class FaqComponent extends Component { } toHTML({ + classes, args: { title, content, faq, button, accordion_color }, jdd_context: { render_markdown, language }, }: ComponentToHTMLArgs): FlatTemplatable { const buttonText = button.buttonText.toUpperCase(); return ( -
+
{title}