From f271ab5645ea990d2cdd7666a93cafa36198507e Mon Sep 17 00:00:00 2001 From: Elvi Shu Date: Mon, 24 Jun 2024 13:06:49 +1000 Subject: [PATCH 1/4] [QOLOE-313]Hide transcript when its content is empty. --- src/components/bs5/video/video.hbs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/bs5/video/video.hbs b/src/components/bs5/video/video.hbs index 9c5b1ea0..a9f58220 100644 --- a/src/components/bs5/video/video.hbs +++ b/src/components/bs5/video/video.hbs @@ -45,6 +45,8 @@ {{! Render the transcript content in an accordion template }} - {{{ transcriptAccordion }}} + {{#if transcriptContent}} + {{{ transcriptAccordion }}} + {{/if}} From eefd22496d47b2c38673e35a4641460032f100d9 Mon Sep 17 00:00:00 2001 From: Elvi Shu Date: Mon, 24 Jun 2024 14:58:41 +1000 Subject: [PATCH 2/4] [QOLOE-192]Update select input's label text colour - Design QA. --- src/components/bs5/textbox/textInput.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/bs5/textbox/textInput.scss b/src/components/bs5/textbox/textInput.scss index f3f718b8..7338296d 100644 --- a/src/components/bs5/textbox/textInput.scss +++ b/src/components/bs5/textbox/textInput.scss @@ -40,7 +40,7 @@ } .qld-text-input-label { - color: var(--#{$prefix}color-default-color-light-text-lighter); + color: var(--#{$prefix}text-grey); display: block; font-weight: 600; line-height: 1.5; From 0092396424a93c0eca55ea8e47e7938752de48b8 Mon Sep 17 00:00:00 2001 From: Elvi Shu Date: Mon, 24 Jun 2024 16:14:52 +1000 Subject: [PATCH 3/4] Revert "[HOTFIX]Update ESBuild to ignore cleaning output folders on initial build or initial watch mode." This reverts commit 27bda01a8cfb4300adcfc6bbaf2fccd482b4d01e. --- .../qgds-plugin-clean-output-folders.js | 39 +++++++------------ 1 file changed, 15 insertions(+), 24 deletions(-) diff --git a/.esbuild/plugins/qgds-plugin-clean-output-folders.js b/.esbuild/plugins/qgds-plugin-clean-output-folders.js index 0e17b4f9..9be85fec 100644 --- a/.esbuild/plugins/qgds-plugin-clean-output-folders.js +++ b/.esbuild/plugins/qgds-plugin-clean-output-folders.js @@ -1,39 +1,30 @@ import fs from "fs"; import log from "../helpers/logger.js"; -/** - * Clean the output folders /dist. - * Skip cleaning during the initial build or initial watch mode. - * - * @returns {Object} Object with a name and a setup function. - */ export default function cleanFoldersPlugin() { - let isInitialBuild = true; return { name: "qgds-clean-output-folders", setup(build) { build.onStart(() => { - if (!isInitialBuild) { - //Console feedback - log("cyan", `\u{1F4C2} Cleaning /dist folders\n\n`); + //Console feedback + log("cyan", `\u{1F4C2} Cleaning /dist folders\n\n`); - // Clean the output folders - const { outdir, outfile } = build.initialOptions; + // Clean the output folders + const { outdir, outfile } = build.initialOptions; - if (outdir && fs.existsSync(outdir)) { - fs.rmSync(outdir, { recursive: true }); - } - - if (outfile && fs.existsSync(outfile)) { - fs.rmSync(outfile); - } + if (outdir && fs.existsSync(outdir)) { + fs.rmSync(outdir, { recursive: true }); + } - // // Clean the docs folder - // const docsdir = "./docs/"; - // if (fs.existsSync(docsdir)) { - // fs.rmSync(docsdir, { recursive: true }); - // } + if (outfile && fs.existsSync(outfile)) { + fs.rmSync(outfile); } + + // // Clean the docs folder + // const docsdir = "./docs/"; + // if (fs.existsSync(docsdir)) { + // fs.rmSync(docsdir, { recursive: true }); + // } }); }, }; From 34051013c8432b6a9b922fea7ec2ce507c028451 Mon Sep 17 00:00:00 2001 From: Elvi Shu Date: Mon, 24 Jun 2024 16:15:15 +1000 Subject: [PATCH 4/4] Revert "[HOTFIX]Add npm command to run a single story in Storybook." This reverts commit dd6a1a673590c8596466d495d8e6d5d488815393. --- .storybook/main.js | 6 ++---- package.json | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.storybook/main.js b/.storybook/main.js index 6baccadd..86fd23ea 100644 --- a/.storybook/main.js +++ b/.storybook/main.js @@ -4,10 +4,8 @@ const config = { "../src/stories/Introduction.mdx", // Include all stories found under the src/components directory ( For example: alert/alert.stories.js ) // Exlude any stories starting with an underscore ( For example: _exludeme.stories.js ) - // "../src/**/!(*_)*.mdx", - // "../src/**/!(*_)*.stories.js", - process.env.STORYBOOK_SINGLE ? process.env.STORYBOOK_SINGLE : "../src/**/!(*_)*.mdx", - process.env.STORYBOOK_SINGLE ? process.env.STORYBOOK_SINGLE : "../src/**/!(*_)*.stories.js", + "../src/**/!(*_)*.mdx", + "../src/**/!(*_)*.stories.js", ], staticDirs: [ { from: '../dist', to: '/assets' }, diff --git a/package.json b/package.json index 07ff4293..3a5c0afc 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,6 @@ "serve": "live-server dist", "dev-storybook": "npm-run-all --parallel watch storybook", "storybook": "storybook dev -p 6006", - "storybook-single": "STORYBOOK_SINGLE=../src/components/bs5/button/button.stories.js npm run storybook", - "storybook-single-watch": "STORYBOOK_SINGLE=../src/components/bs5/button/button.stories.js npm-run-all --parallel watch storybook", "build-storybook": "storybook build --webpack-stats-json ", "build-storybook:serve": "live-server storybook-static" },