From df948d7ed26377b0d11de31cbb56bbfe0189b8e5 Mon Sep 17 00:00:00 2001 From: Asif Amin <30643973+asifamingov@users.noreply.github.com> Date: Thu, 16 Apr 2020 16:42:26 +1000 Subject: [PATCH] Release v3.1.10 (#247) * CMS-182 - Update aside font size to match SWE2 * CMS-182 - Update aside font size to match SWE2 * CMS-182 - Update aside font size to match SWE2 * updated header and footer portions to work with Bootstrap 4 * updated header and footer portions to work with Bootstrap 4 * layout enhancements with Bootstrap 4 * layout enhancements with Bootstrap 4 * layout enhancements with Bootstrap 4 * layout enhancements with Bootstrap 4 * changed breakpoints to use bootstrap v4 * changed breakpoints to use bootstrap v4 * QOL-4230 - butterfly from correct CDN * Bootstrap 4 updates * bootstrap 4 visual enhancements * QOL-4230 - added task to generate versions folder on release * QOL-4230 - added symlink for folders * carousel fix on page loading * added a function to identify CDN path * added a butterfly file using CDN * improved alert and forms styles * improved alert and forms styles * improved doc * QOL-4228 removed commented out stuff and cleaned the code * QOL-4228 removed margin from alerts * QOL-4228 fixed font size * QOL-4340-Added SWE release process * QOL-4340-Added SWE release process * QOL-4340-Added SWE release process updates * QOL-4340-changed names of the npm task * QOL-4340-changed name to make it more clear * QOL-4340-changed email in NPM docs * QOL-4340-updated docs * QOL-4340-updated docs * Release v3.1.1 (#167) * SWE documentation updates - Dec 2018 SWE documentation updates - Dec 2018 * Qol 4340 swe3 bootstrap 4 e2 e (#153) * QOL-4340-SWE3 Bootstrap 4 UI components E2E test cases * QOL-4340-SWE3 Bootstrap 4 UI components E2E test cases * QOL-4340-SWE3 Bootstrap 4 UI components E2E test cases * QOL-4340-SWE3 added mobile tests * QOL-4340 testing description update * QOL-4340-added gulp protractor * QOL-4340-added tests * merged QOL-4344-SWE-documentation-updates---Dec-2018 * removed bootstrap 4 debugging script * Qol 42660 swe3 enhance slider functionality (#154) * [QOL-4266] SWE3 - Enhance slider functionality * Qol 42660 swe3 enhance slider functionality (#155) * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] added gitignore to ignore screenshots * [QOL-4266] added styles for link container * [QOL-4266] carousel styles * [QOL-4266] carousel styles * QOL-4262 Remove footer links in print view (#156) Merged * Qol 4384 squiz with bootstrap4 (#157) * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] added gitignore to ignore screenshots * [QOL-4266] added styles for link container * [QOL-4266] carousel styles * [QOL-4266] carousel styles * [QOL-4266] carousel styles * [QOL-4266] docs from local assets * [QOL-4266] serve files task changes * QOL-4413 - Content pages without left navigation * QOL-4402 In IE the Alert message symbol is not in line. * print stylesheet modifications * QOL 1754 Google autocomplete (#158) * QOL-1754 Initial subpremise functionality * QOL-1754 Updates to functionality * QOL-1754 Updates to format address * QOL-1754 Update * QOL-4428 - Guide Page- Additional padding displayed in the left Nav * added text in placeholder image in docs * Update components.html updated docs * added option to put carousel speed * Update components.html updated doc * resolved conflicts in doc pages * resolved conflicts in doc pages * QOL-4340 Baseline templates screenshots * QOL-1754 Updates to autocomplete tab enter controls (#160) * QOL 1754 Autocomplete Tab + Enter (#161) * QOL-1754 Updates to autocomplete tab enter controls * QOL-1754 Cleaning up prompts and console logs * QOL-1754 Updates to error handling * QOL-1754 Resetting values when the user clicks preselected option * QOL 1754 autocomplete tabenter (#162) * QOL-1754 Updates to autocomplete tab enter controls * QOL-4340 Baseline templates screenshots * QOL-4340 Baseline templates screenshots * QOL-4413 - Content pages without left navigation -transferred to Matrix assets as it is fox for matrox only * QOL 1754 autocomplete tabenter (#163) * QOL-1754 Updates to autocomplete tab enter controls * QOL-1754 Cleaning up prompts and console logs * QOL-1754 Updates to error handling * QOL-1754 Resetting values when the user clicks preselected option * QOL-1754 Edits to autocomplete * QOL-1754 Update to char length for tab enter select * QOL 1754 autocomplete tabenter (#164) * QOL-1754 Fixing firefox event not defined issue * QOL-4413 Content pages without left navigation * Qol 1754 autocomplete tabenter (#165) * QOL-1754 Fixing firefox event not defined issue * QOL-1754 Updating documentation * QOL-1754 Fix * [QOL-4460]-Browser compatibility Prod issue - Guide Page - StepNaN is displayed in mobile devices * QOL 1754 autocomplete tabenter (#166) * QOL-1754 Updating component documentation * QOL-1754 Removing template page * QOL-4485 - Browser compatibility - In IE 11 progressive reveal is not working as expected as the entire form is displayed * QOL-4266- SWE3 - Enhance slider functionality * remove quick exit is printed on top of text. * QOL-4266 aligned slider options * QOL-4266 carousel buttons styling * slider styles * QOL-4340 build task edit to include bootstrap.js file * QOL-4340 Baseline templates screenshots * QOL-4340 removed unused print styles * QOL-4340 font awesome link correction * port * QOL-4545 Incorrect Google Maps key in SWE 3.1.1 * QOL-4545 Incorrect Google Maps key in SWE 3.1.1 * QOL-4498 Browser type included in feedback form emails * QOL-4545 Incorrect Google Maps key in SWE 3.1.1 * Updates to Foundations, Components and Utilities Added Foundartions webpage Updated Components page (alerts, survey, clean-up of descriptions) Updated Utilities page with Funnelback indexing advice * QOL-4015 - SWE3 - 2 column page model * QOL-4005-SWE3 - Standfirst content type * QOL-4493 - Move document links script to SWE3 * QOL-4493 - Move document links script to SWE3 * QOL-4061 SWE3 - Enhance accordion look and feel * QOL-4444 - Decouple aggregation page styles to standalone components * QOL-4005 SWE3 - Standfirst content type * Updates to Cards and Accordion Updates to Cards and Accordion * created release 3.1.5 branch * Qol 4469 image gallery swe3 (#176) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * Qol 4879 enhancements to figure styles (#177) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4879 - Enhancements to Figure styles * Update components.html Added description and example class to gallery component * Update qg-utilities.html Added advice for click-to-call links * Update index.html Replaced OSSSIO branding with HPW * recent changes * recent changes (#178) * QOL-4778 - SWE 3.1.5 * Added static maps function * Added base template screenshots * Updated packages - there was a security alert from Github * removed links added styles in alert * Jackie docs (#182) * CMS-182 - Update aside font size to match SWE2 * CMS-182 - Update aside font size to match SWE2 * CMS-182 - Update aside font size to match SWE2 * updated header and footer portions to work with Bootstrap 4 * updated header and footer portions to work with Bootstrap 4 * layout enhancements with Bootstrap 4 * layout enhancements with Bootstrap 4 * layout enhancements with Bootstrap 4 * layout enhancements with Bootstrap 4 * changed breakpoints to use bootstrap v4 * changed breakpoints to use bootstrap v4 * QOL-4230 - butterfly from correct CDN * Bootstrap 4 updates * bootstrap 4 visual enhancements * QOL-4230 - added task to generate versions folder on release * QOL-4230 - added symlink for folders * carousel fix on page loading * added a function to identify CDN path * added a butterfly file using CDN * improved alert and forms styles * improved alert and forms styles * improved doc * QOL-4228 removed commented out stuff and cleaned the code * QOL-4228 removed margin from alerts * QOL-4228 fixed font size * QOL-4340-Added SWE release process * QOL-4340-Added SWE release process * QOL-4340-Added SWE release process updates * QOL-4340-changed names of the npm task * QOL-4340-changed name to make it more clear * QOL-4340-changed email in NPM docs * QOL-4340-updated docs * QOL-4340-updated docs * Release v3.1.1 (#167) * SWE documentation updates - Dec 2018 SWE documentation updates - Dec 2018 * Qol 4340 swe3 bootstrap 4 e2 e (#153) * QOL-4340-SWE3 Bootstrap 4 UI components E2E test cases * QOL-4340-SWE3 Bootstrap 4 UI components E2E test cases * QOL-4340-SWE3 Bootstrap 4 UI components E2E test cases * QOL-4340-SWE3 added mobile tests * QOL-4340 testing description update * QOL-4340-added gulp protractor * QOL-4340-added tests * merged QOL-4344-SWE-documentation-updates---Dec-2018 * removed bootstrap 4 debugging script * Qol 42660 swe3 enhance slider functionality (#154) * [QOL-4266] SWE3 - Enhance slider functionality * Qol 42660 swe3 enhance slider functionality (#155) * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] added gitignore to ignore screenshots * [QOL-4266] added styles for link container * [QOL-4266] carousel styles * [QOL-4266] carousel styles * QOL-4262 Remove footer links in print view (#156) Merged * Qol 4384 squiz with bootstrap4 (#157) * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] added gitignore to ignore screenshots * [QOL-4266] added styles for link container * [QOL-4266] carousel styles * [QOL-4266] carousel styles * [QOL-4266] carousel styles * [QOL-4266] docs from local assets * [QOL-4266] serve files task changes * QOL-4413 - Content pages without left navigation * QOL-4402 In IE the Alert message symbol is not in line. * print stylesheet modifications * QOL 1754 Google autocomplete (#158) * QOL-1754 Initial subpremise functionality * QOL-1754 Updates to functionality * QOL-1754 Updates to format address * QOL-1754 Update * QOL-4428 - Guide Page- Additional padding displayed in the left Nav * added text in placeholder image in docs * Update components.html updated docs * added option to put carousel speed * Update components.html updated doc * resolved conflicts in doc pages * resolved conflicts in doc pages * QOL-4340 Baseline templates screenshots * QOL-1754 Updates to autocomplete tab enter controls (#160) * QOL 1754 Autocomplete Tab + Enter (#161) * QOL-1754 Updates to autocomplete tab enter controls * QOL-1754 Cleaning up prompts and console logs * QOL-1754 Updates to error handling * QOL-1754 Resetting values when the user clicks preselected option * QOL 1754 autocomplete tabenter (#162) * QOL-1754 Updates to autocomplete tab enter controls * QOL-4340 Baseline templates screenshots * QOL-4340 Baseline templates screenshots * QOL-4413 - Content pages without left navigation -transferred to Matrix assets as it is fox for matrox only * QOL 1754 autocomplete tabenter (#163) * QOL-1754 Updates to autocomplete tab enter controls * QOL-1754 Cleaning up prompts and console logs * QOL-1754 Updates to error handling * QOL-1754 Resetting values when the user clicks preselected option * QOL-1754 Edits to autocomplete * QOL-1754 Update to char length for tab enter select * QOL 1754 autocomplete tabenter (#164) * QOL-1754 Fixing firefox event not defined issue * QOL-4413 Content pages without left navigation * Qol 1754 autocomplete tabenter (#165) * QOL-1754 Fixing firefox event not defined issue * QOL-1754 Updating documentation * QOL-1754 Fix * [QOL-4460]-Browser compatibility Prod issue - Guide Page - StepNaN is displayed in mobile devices * QOL 1754 autocomplete tabenter (#166) * QOL-1754 Updating component documentation * QOL-1754 Removing template page * QOL-4485 - Browser compatibility - In IE 11 progressive reveal is not working as expected as the entire form is displayed * QOL-4266- SWE3 - Enhance slider functionality * remove quick exit is printed on top of text. * QOL-4266 aligned slider options * QOL-4266 carousel buttons styling * slider styles * QOL-4340 build task edit to include bootstrap.js file * QOL-4340 Baseline templates screenshots * QOL-4340 removed unused print styles * QOL-4340 font awesome link correction * port * QOL-4545 Incorrect Google Maps key in SWE 3.1.1 * QOL-4545 Incorrect Google Maps key in SWE 3.1.1 * QOL-4498 Browser type included in feedback form emails * QOL-4545 Incorrect Google Maps key in SWE 3.1.1 * Updates to Foundations, Components and Utilities Added Foundartions webpage Updated Components page (alerts, survey, clean-up of descriptions) Updated Utilities page with Funnelback indexing advice * QOL-4015 - SWE3 - 2 column page model * QOL-4005-SWE3 - Standfirst content type * QOL-4493 - Move document links script to SWE3 * QOL-4493 - Move document links script to SWE3 * QOL-4061 SWE3 - Enhance accordion look and feel * QOL-4444 - Decouple aggregation page styles to standalone components * QOL-4005 SWE3 - Standfirst content type * Updates to Cards and Accordion Updates to Cards and Accordion * created release 3.1.5 branch * Qol 4469 image gallery swe3 (#176) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * Qol 4879 enhancements to figure styles (#177) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4879 - Enhancements to Figure styles * Update components.html Added description and example class to gallery component * Update qg-utilities.html Added advice for click-to-call links * Update index.html Replaced OSSSIO branding with HPW * added a missing package * Docs changes * Added semantic HTML to example to Blockquote component Added semantic HTML to example to Blockquote component * QOL-5473 Expand legacy form validation (#181) * Release v3.1.5 (#179) * created release 3.1.5 branch * Qol 4469 image gallery swe3 (#176) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * Qol 4879 enhancements to figure styles (#177) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4879 - Enhancements to Figure styles * recent changes * recent changes (#178) * QOL-4778 - SWE 3.1.5 * Added static maps function * Added base template screenshots * Updated packages - there was a security alert from Github in these 2 packages version (#180) * Legacy form validation update Validation updated to allow form check without a form submit, also update to jquery 3.0.0 event binding methods * Legacy form validation update corrections, more comments added * Legacy form validation with more comments added * Qol 5057 sew3 button changes (#184) * QOL-5057 - SEW3 button ":active" states incorrect colours * QOL-3766- Unwanted gap between top header and page * QOL-5326- new key for swe documentation * QOL-5057 - SEW3 button improvements * QOL-5057 - SEW3 button improvements * QOL-4766 - SWE3 aside unordered list formatting * QOL-5057 - more button updates after feedback * QOL-4469- Move image gallery as a component in SWE3 * QOL-4469- Move image gallery as a component in SWE3 * Qol 5384 recaptcha fix (#183) * Release v3.1.5 (#179) * created release 3.1.5 branch * Qol 4469 image gallery swe3 (#176) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * Qol 4879 enhancements to figure styles (#177) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4879 - Enhancements to Figure styles * recent changes * recent changes (#178) * QOL-4778 - SWE 3.1.5 * Added static maps function * Added base template screenshots * Updated packages - there was a security alert from Github in these 2 packages version (#180) * QOL-5384 Fix to recaptcha, requires reset after first init * QOL-5384 Fix * Updated screenshots * Updated webpack task to update CDN link on prod release * QOL-4469- added a class to initialize fancybox without any stylings * QOL-4469- Move image gallery as a component in SWE3 * QOL-4469- Move image gallery as a component in SWE3 * QOL-5579 * QOL-5543-Change funnelback link to https://www.qld.gov.au/search (#195) * QOL-5543-Change funnelback link to https://www.qld.gov.au/search and buttons styles improvements * Added usage considerations to Alerts component Added usage considerations to Alerts component * Added code example to alert role Added code example to alert role * added release branch and some minor button styles * Fixed link - issue raised using Github issue https://github.com/qld-gov-au/web-template-release/issues/5 * Qol 5430 accordion styling fix (#199) * forms styles cleaning * DC-6917 - document type fix -> removing duplicate document type * revert document links change * DC-6917 - duplicate document type issue fixed * QOL-5436 - SWE3 - Update Government employees link (#200) * Qol 5413 pagination style enhancement (#201) * QOL-5436 - SWE3 - Update Government employees link * pagination and accordion styles enhancements * QOL-5481 - Chevrons size fix * QOL-5662 - SWE3 table styles * QOL-5481 Aggregation page styles (#202) * QOL-5481 Aggregation page styles * QOL-5481 added pagination color variables * QOL-5481 added screenshots for template changes * version increment * added accordion example in docs and added additional styles from matrix to SWE * added accordion example in docs and styles fixes for pagination * IOS safari fix - focus on accordion * Improved pagination styles * Added datatable images from SWE2 repo * updated release number * QOL-5877 - Debug and fix - Fancybox errors when using HtmlUnitDriver (#214) * Qol 5899 circle ci integration (#215) * Added circle CI config * Added circle CI * Added circle CI * Added tests and config files * QOL-5820 Alert list styles padding * QOL 5801 open graph tags (#205) * Release v3.1.7 (#203) * CMS-182 - Update aside font size to match SWE2 * CMS-182 - Update aside font size to match SWE2 * CMS-182 - Update aside font size to match SWE2 * updated header and footer portions to work with Bootstrap 4 * updated header and footer portions to work with Bootstrap 4 * layout enhancements with Bootstrap 4 * layout enhancements with Bootstrap 4 * layout enhancements with Bootstrap 4 * layout enhancements with Bootstrap 4 * changed breakpoints to use bootstrap v4 * changed breakpoints to use bootstrap v4 * QOL-4230 - butterfly from correct CDN * Bootstrap 4 updates * bootstrap 4 visual enhancements * QOL-4230 - added task to generate versions folder on release * QOL-4230 - added symlink for folders * carousel fix on page loading * added a function to identify CDN path * added a butterfly file using CDN * improved alert and forms styles * improved alert and forms styles * improved doc * QOL-4228 removed commented out stuff and cleaned the code * QOL-4228 removed margin from alerts * QOL-4228 fixed font size * QOL-4340-Added SWE release process * QOL-4340-Added SWE release process * QOL-4340-Added SWE release process updates * QOL-4340-changed names of the npm task * QOL-4340-changed name to make it more clear * QOL-4340-changed email in NPM docs * QOL-4340-updated docs * QOL-4340-updated docs * Release v3.1.1 (#167) * SWE documentation updates - Dec 2018 SWE documentation updates - Dec 2018 * Qol 4340 swe3 bootstrap 4 e2 e (#153) * QOL-4340-SWE3 Bootstrap 4 UI components E2E test cases * QOL-4340-SWE3 Bootstrap 4 UI components E2E test cases * QOL-4340-SWE3 Bootstrap 4 UI components E2E test cases * QOL-4340-SWE3 added mobile tests * QOL-4340 testing description update * QOL-4340-added gulp protractor * QOL-4340-added tests * merged QOL-4344-SWE-documentation-updates---Dec-2018 * removed bootstrap 4 debugging script * Qol 42660 swe3 enhance slider functionality (#154) * [QOL-4266] SWE3 - Enhance slider functionality * Qol 42660 swe3 enhance slider functionality (#155) * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] added gitignore to ignore screenshots * [QOL-4266] added styles for link container * [QOL-4266] carousel styles * [QOL-4266] carousel styles * QOL-4262 Remove footer links in print view (#156) Merged * Qol 4384 squiz with bootstrap4 (#157) * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] added gitignore to ignore screenshots * [QOL-4266] added styles for link container * [QOL-4266] carousel styles * [QOL-4266] carousel styles * [QOL-4266] carousel styles * [QOL-4266] docs from local assets * [QOL-4266] serve files task changes * QOL-4413 - Content pages without left navigation * QOL-4402 In IE the Alert message symbol is not in line. * print stylesheet modifications * QOL 1754 Google autocomplete (#158) * QOL-1754 Initial subpremise functionality * QOL-1754 Updates to functionality * QOL-1754 Updates to format address * QOL-1754 Update * QOL-4428 - Guide Page- Additional padding displayed in the left Nav * added text in placeholder image in docs * Update components.html updated docs * added option to put carousel speed * Update components.html updated doc * resolved conflicts in doc pages * resolved conflicts in doc pages * QOL-4340 Baseline templates screenshots * QOL-1754 Updates to autocomplete tab enter controls (#160) * QOL 1754 Autocomplete Tab + Enter (#161) * QOL-1754 Updates to autocomplete tab enter controls * QOL-1754 Cleaning up prompts and console logs * QOL-1754 Updates to error handling * QOL-1754 Resetting values when the user clicks preselected option * QOL 1754 autocomplete tabenter (#162) * QOL-1754 Updates to autocomplete tab enter controls * QOL-4340 Baseline templates screenshots * QOL-4340 Baseline templates screenshots * QOL-4413 - Content pages without left navigation -transferred to Matrix assets as it is fox for matrox only * QOL 1754 autocomplete tabenter (#163) * QOL-1754 Updates to autocomplete tab enter controls * QOL-1754 Cleaning up prompts and console logs * QOL-1754 Updates to error handling * QOL-1754 Resetting values when the user clicks preselected option * QOL-1754 Edits to autocomplete * QOL-1754 Update to char length for tab enter select * QOL 1754 autocomplete tabenter (#164) * QOL-1754 Fixing firefox event not defined issue * QOL-4413 Content pages without left navigation * Qol 1754 autocomplete tabenter (#165) * QOL-1754 Fixing firefox event not defined issue * QOL-1754 Updating documentation * QOL-1754 Fix * [QOL-4460]-Browser compatibility Prod issue - Guide Page - StepNaN is displayed in mobile devices * QOL 1754 autocomplete tabenter (#166) * QOL-1754 Updating component documentation * QOL-1754 Removing template page * QOL-4485 - Browser compatibility - In IE 11 progressive reveal is not working as expected as the entire form is displayed * QOL-4266- SWE3 - Enhance slider functionality * remove quick exit is printed on top of text. * QOL-4266 aligned slider options * QOL-4266 carousel buttons styling * slider styles * QOL-4340 build task edit to include bootstrap.js file * QOL-4340 Baseline templates screenshots * QOL-4340 removed unused print styles * QOL-4340 font awesome link correction * port * QOL-4545 Incorrect Google Maps key in SWE 3.1.1 * QOL-4545 Incorrect Google Maps key in SWE 3.1.1 * QOL-4498 Browser type included in feedback form emails * QOL-4545 Incorrect Google Maps key in SWE 3.1.1 * Updates to Foundations, Components and Utilities Added Foundartions webpage Updated Components page (alerts, survey, clean-up of descriptions) Updated Utilities page with Funnelback indexing advice * QOL-4015 - SWE3 - 2 column page model * QOL-4005-SWE3 - Standfirst content type * QOL-4493 - Move document links script to SWE3 * QOL-4493 - Move document links script to SWE3 * QOL-4061 SWE3 - Enhance accordion look and feel * QOL-4444 - Decouple aggregation page styles to standalone components * QOL-4005 SWE3 - Standfirst content type * Updates to Cards and Accordion Updates to Cards and Accordion * created release 3.1.5 branch * Qol 4469 image gallery swe3 (#176) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * Qol 4879 enhancements to figure styles (#177) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4879 - Enhancements to Figure styles * Update components.html Added description and example class to gallery component * Update qg-utilities.html Added advice for click-to-call links * Update index.html Replaced OSSSIO branding with HPW * recent changes * recent changes (#178) * QOL-4778 - SWE 3.1.5 * Added static maps function * Added base template screenshots * Updated packages - there was a security alert from Github * removed links added styles in alert * Jackie docs (#182) * CMS-182 - Update aside font size to match SWE2 * CMS-182 - Update aside font size to match SWE2 * CMS-182 - Update aside font size to match SWE2 * updated header and footer portions to work with Bootstrap 4 * updated header and footer portions to work with Bootstrap 4 * layout enhancements with Bootstrap 4 * layout enhancements with Bootstrap 4 * layout enhancements with Bootstrap 4 * layout enhancements with Bootstrap 4 * changed breakpoints to use bootstrap v4 * changed breakpoints to use bootstrap v4 * QOL-4230 - butterfly from correct CDN * Bootstrap 4 updates * bootstrap 4 visual enhancements * QOL-4230 - added task to generate versions folder on release * QOL-4230 - added symlink for folders * carousel fix on page loading * added a function to identify CDN path * added a butterfly file using CDN * improved alert and forms styles * improved alert and forms styles * improved doc * QOL-4228 removed commented out stuff and cleaned the code * QOL-4228 removed margin from alerts * QOL-4228 fixed font size * QOL-4340-Added SWE release process * QOL-4340-Added SWE release process * QOL-4340-Added SWE release process updates * QOL-4340-changed names of the npm task * QOL-4340-changed name to make it more clear * QOL-4340-changed email in NPM docs * QOL-4340-updated docs * QOL-4340-updated docs * Release v3.1.1 (#167) * SWE documentation updates - Dec 2018 SWE documentation updates - Dec 2018 * Qol 4340 swe3 bootstrap 4 e2 e (#153) * QOL-4340-SWE3 Bootstrap 4 UI components E2E test cases * QOL-4340-SWE3 Bootstrap 4 UI components E2E test cases * QOL-4340-SWE3 Bootstrap 4 UI components E2E test cases * QOL-4340-SWE3 added mobile tests * QOL-4340 testing description update * QOL-4340-added gulp protractor * QOL-4340-added tests * merged QOL-4344-SWE-documentation-updates---Dec-2018 * removed bootstrap 4 debugging script * Qol 42660 swe3 enhance slider functionality (#154) * [QOL-4266] SWE3 - Enhance slider functionality * Qol 42660 swe3 enhance slider functionality (#155) * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] added gitignore to ignore screenshots * [QOL-4266] added styles for link container * [QOL-4266] carousel styles * [QOL-4266] carousel styles * QOL-4262 Remove footer links in print view (#156) Merged * Qol 4384 squiz with bootstrap4 (#157) * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] SWE3 - Enhance slider functionality * [QOL-4266] added gitignore to ignore screenshots * [QOL-4266] added styles for link container * [QOL-4266] carousel styles * [QOL-4266] carousel styles * [QOL-4266] carousel styles * [QOL-4266] docs from local assets * [QOL-4266] serve files task changes * QOL-4413 - Content pages without left navigation * QOL-4402 In IE the Alert message symbol is not in line. * print stylesheet modifications * QOL 1754 Google autocomplete (#158) * QOL-1754 Initial subpremise functionality * QOL-1754 Updates to functionality * QOL-1754 Updates to format address * QOL-1754 Update * QOL-4428 - Guide Page- Additional padding displayed in the left Nav * added text in placeholder image in docs * Update components.html updated docs * added option to put carousel speed * Update components.html updated doc * resolved conflicts in doc pages * resolved conflicts in doc pages * QOL-4340 Baseline templates screenshots * QOL-1754 Updates to autocomplete tab enter controls (#160) * QOL 1754 Autocomplete Tab + Enter (#161) * QOL-1754 Updates to autocomplete tab enter controls * QOL-1754 Cleaning up prompts and console logs * QOL-1754 Updates to error handling * QOL-1754 Resetting values when the user clicks preselected option * QOL 1754 autocomplete tabenter (#162) * QOL-1754 Updates to autocomplete tab enter controls * QOL-4340 Baseline templates screenshots * QOL-4340 Baseline templates screenshots * QOL-4413 - Content pages without left navigation -transferred to Matrix assets as it is fox for matrox only * QOL 1754 autocomplete tabenter (#163) * QOL-1754 Updates to autocomplete tab enter controls * QOL-1754 Cleaning up prompts and console logs * QOL-1754 Updates to error handling * QOL-1754 Resetting values when the user clicks preselected option * QOL-1754 Edits to autocomplete * QOL-1754 Update to char length for tab enter select * QOL 1754 autocomplete tabenter (#164) * QOL-1754 Fixing firefox event not defined issue * QOL-4413 Content pages without left navigation * Qol 1754 autocomplete tabenter (#165) * QOL-1754 Fixing firefox event not defined issue * QOL-1754 Updating documentation * QOL-1754 Fix * [QOL-4460]-Browser compatibility Prod issue - Guide Page - StepNaN is displayed in mobile devices * QOL 1754 autocomplete tabenter (#166) * QOL-1754 Updating component documentation * QOL-1754 Removing template page * QOL-4485 - Browser compatibility - In IE 11 progressive reveal is not working as expected as the entire form is displayed * QOL-4266- SWE3 - Enhance slider functionality * remove quick exit is printed on top of text. * QOL-4266 aligned slider options * QOL-4266 carousel buttons styling * slider styles * QOL-4340 build task edit to include bootstrap.js file * QOL-4340 Baseline templates screenshots * QOL-4340 removed unused print styles * QOL-4340 font awesome link correction * port * QOL-4545 Incorrect Google Maps key in SWE 3.1.1 * QOL-4545 Incorrect Google Maps key in SWE 3.1.1 * QOL-4498 Browser type included in feedback form emails * QOL-4545 Incorrect Google Maps key in SWE 3.1.1 * Updates to Foundations, Components and Utilities Added Foundartions webpage Updated Components page (alerts, survey, clean-up of descriptions) Updated Utilities page with Funnelback indexing advice * QOL-4015 - SWE3 - 2 column page model * QOL-4005-SWE3 - Standfirst content type * QOL-4493 - Move document links script to SWE3 * QOL-4493 - Move document links script to SWE3 * QOL-4061 SWE3 - Enhance accordion look and feel * QOL-4444 - Decouple aggregation page styles to standalone components * QOL-4005 SWE3 - Standfirst content type * Updates to Cards and Accordion Updates to Cards and Accordion * created release 3.1.5 branch * Qol 4469 image gallery swe3 (#176) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * Qol 4879 enhancements to figure styles (#177) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4879 - Enhancements to Figure styles * Update components.html Added description and example class to gallery component * Update qg-utilities.html Added advice for click-to-call links * Update index.html Replaced OSSSIO branding with HPW * added a missing package * Docs changes * Added semantic HTML to example to Blockquote component Added semantic HTML to example to Blockquote component * QOL-5473 Expand legacy form validation (#181) * Release v3.1.5 (#179) * created release 3.1.5 branch * Qol 4469 image gallery swe3 (#176) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * Qol 4879 enhancements to figure styles (#177) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4879 - Enhancements to Figure styles * recent changes * recent changes (#178) * QOL-4778 - SWE 3.1.5 * Added static maps function * Added base template screenshots * Updated packages - there was a security alert from Github in these 2 packages version (#180) * Legacy form validation update Validation updated to allow form check without a form submit, also update to jquery 3.0.0 event binding methods * Legacy form validation update corrections, more comments added * Legacy form validation with more comments added * Qol 5057 sew3 button changes (#184) * QOL-5057 - SEW3 button ":active" states incorrect colours * QOL-3766- Unwanted gap between top header and page * QOL-5326- new key for swe documentation * QOL-5057 - SEW3 button improvements * QOL-5057 - SEW3 button improvements * QOL-4766 - SWE3 aside unordered list formatting * QOL-5057 - more button updates after feedback * QOL-4469- Move image gallery as a component in SWE3 * QOL-4469- Move image gallery as a component in SWE3 * Qol 5384 recaptcha fix (#183) * Release v3.1.5 (#179) * created release 3.1.5 branch * Qol 4469 image gallery swe3 (#176) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * Qol 4879 enhancements to figure styles (#177) * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 Move image gallery as a component in SWE3 * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4469 code cleaning * QOL-4879 - Enhancements to Figure styles * recent changes * recent changes (#178) * QOL-4778 - SWE 3.1.5 * Added static maps function * Added base template screenshots * Updated packages - there was a security alert from Github in these 2 packages version (#180) * QOL-5384 Fix to recaptcha, requires reset after first init * QOL-5384 Fix * Updated screenshots * Updated webpack task to update CDN link on prod release * QOL-4469- added a class to initialize fancybox without any stylings * QOL-4469- Move image gallery as a component in SWE3 * QOL-4469- Move image gallery as a component in SWE3 * QOL-5579 * QOL-5543-Change funnelback link to https://www.qld.gov.au/search (#195) * QOL-5543-Change funnelback link to https://www.qld.gov.au/search and buttons styles improvements * Added usage considerations to Alerts component Added usage considerations to Alerts component * Added code example to alert role Added code example to alert role * added release branch and some minor button styles * Fixed link - issue raised using Github issue https://github.com/qld-gov-au/web-template-release/issues/5 * Qol 5430 accordion styling fix (#199) * forms styles cleaning * DC-6917 - document type fix -> removing duplicate document type * revert document links change * DC-6917 - duplicate document type issue fixed * QOL-5436 - SWE3 - Update Government employees link (#200) * Qol 5413 pagination style enhancement (#201) * QOL-5436 - SWE3 - Update Government employees link * pagination and accordion styles enhancements * QOL-5481 - Chevrons size fix * QOL-5662 - SWE3 table styles * QOL-5481 Aggregation page styles (#202) * QOL-5481 Aggregation page styles * QOL-5481 added pagination color variables * QOL-5481 added screenshots for template changes * version increment * added accordion example in docs and added additional styles from matrix to SWE * added accordion example in docs and styles fixes for pagination * IOS safari fix - focus on accordion * Improved pagination styles * Update jest requirement from ^23.6.0 to ^24.9.0 (#204) Updates the requirements on [jest](https://github.com/facebook/jest) to permit the latest version. - [Release notes](https://github.com/facebook/jest/releases) - [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/jest/compare/v23.6.0...v24.9.0) Signed-off-by: dependabot-preview[bot] * Update gulp-connect-ssi requirement from ^0.3.2 to ^0.4.0 (#194) Updates the requirements on [gulp-connect-ssi](https://github.com/fanyegong/gulp-connect-ssi) to permit the latest version. - [Release notes](https://github.com/fanyegong/gulp-connect-ssi/releases) - [Commits](https://github.com/fanyegong/gulp-connect-ssi/commits) Signed-off-by: dependabot-preview[bot] * Update file-loader requirement from ^0.11.1 to ^2.0.0 (#193) Updates the requirements on [file-loader](https://github.com/webpack-contrib/file-loader) to permit the latest version. - [Release notes](https://github.com/webpack-contrib/file-loader/releases) - [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack-contrib/file-loader/compare/v0.11.1...v2.0.0) Signed-off-by: dependabot-preview[bot] * QOL-5801 Added OpenGraph tags into standard template * QOL-5801 Updating opengraph WIP * QOL-5905 - highlight (focus) expand all and collapse al * QOL-5906 - Implement radio button and checkbox theme * Accordion control markup corrections * Accordion control markup corrections and backward compatibility * removed duplicate accordion arrow style * updated docs * QOL 5801 open graph tags (#216) * QOL-5801 Added OpenGraph tags into standard template * QOL-5801 Updating opengraph WIP * QOL-5801 Updates for twitter * QOL-5801 Updates to opengraph tagging * QOL-5801 Opengraph * QOL 5801 open graph tags (#217) * QOL-5801 Added OpenGraph tags into standard template * QOL-5801 Updating opengraph WIP * QOL-5801 Updates for twitter * QOL-5801 Updates to opengraph tagging * QOL-5801 Opengraph * QOL-5801 Open Graph * updated gallery component to include data attributes dynamically * Jackie docs (#219) * removed list items * Created forms.html - Moved all content from "Patterns for web forms" to the SWE3 Web Template Documentation on GitHub, with exception to 'Examples' - There have been a number of issues when adding examples where styles are broken. Have written "ADD EXAMPLE" where a working example will need to be added by a UI dev * Added tables component * improved gallery component * QOL-5600 - Document link styles update * underline on hover expand and callapse accordion * QOL-6078 Update Footer feedback and Tweak reCAPTCHA code to handle v2 and v3, (#220) * QOL-6078 Add missing footer feedback field which is required. Tweak recaptcha code to handle v2 and v3, add new v3 keys for footer feedback but still allow v2 when its not footer feed back on the page unless override options data-sitekey and or data-recaptcha-action is set on the form * QOL-6078 roll back options.html to have input before label * fixed CSS to hide captcha container * set Url according to the env and insert recaptcha enable attr if not present * added check form condition * changed syntax * QOL-6078 need to load multiple onrenders for v3 keys if they exist on the page * QOL-6078 Ensure footer feedback is only loaded if the feedback button is clicked, ensure v2 and v3 renders are called if they exist on the page * added github and cleaned CSS * QOL-6078 Minor correction on using v3 default key with different action, clean up recaptcha test file to work with footer * docs update - added forms section * added autocomplete class checking * autocomplete box style changes * corrected test according to the new class * QOL-6033 SWE - Updates to Blurb (aggregation page) (#223) * QOL-5137 - Rollout Quick exit developed in DFV as Global component (#225) * QOL-5137 - Rollout Quick exit developed in DFV as Global component * Circle CI re run * Qol 6026 swe definition list (#226) * QOL-5137 - Rollout Quick exit developed in DFV as Global component * description list styles * QOL-4445 - Remove aggregation page styles from Matrix * QOL-4445 - Remove aggregation page styles from Matrix * aggregation styles update * Removed text from Twitter share * Qol 6033 swe updates to blurb aggregation page (#224) * QOL-6033 SWE - blurb position change on xs size (mobile phone sizes) * QOL-6025 Add border radius to Cards component * blurb button class correction * quick exit IE11 fix * Updated NPM version * added Radio button and Checkbox pattern in doc * improved docs * QOL-6026 reverted changes to def list QOL-6026 * Added a script to load Date polyfill if not supported in a Browser (#231) * Added a script to load Date polyfill if not supported in a Browser * removed date polyfill from package.json * added nodep-date-input-polyfill npm and gulp task to transfer files from node_modules * improved date polyfill loader only if date is present and Sticky fill as an ext lib * removed UglifyJsPlugin * added UglifyJsPlugin * Qol 6369 accordion accessibilit y (#233) * QOL-6369 Accordion accessibility issue (keyboard interaction) * QOL-6433 Quick exit fix for IE11 and QOL-6369 Accordion accessibility issue (keyboard interaction) * QOL-6359 QOL-6414 Updated * QOL-6369 Updated after incorrect merge * QOL-6415 Updated footer inputs and form element * QOL-6359 Custom tag change * Accordion bug fixed - click on child elements triggering the parent event * Accordion bug fixed - click on child elements triggering the parent event * QOL-6366 cleaned up technical debt noticed, modified onblur * QOL-6366 cleaned up technical debt * optional jquery datepicker * optional jquery datepicker * optional jquery datepicker * accordion accessibility changes * other assets transfer task improvments * QOL-6366 Rollback * env file Improvements * accordion improvements * accordion improvements * updated package.json file * QOL-5651 - Fix aggregation page spacing issues * QOL-5651 - Fix aggregation page spacing issues * QOL-5651 - Fix aggregation page spacing issues * FireFox print styles fix * QOL-6696-replace fs-path in github package.json with alternative (#248) Co-authored-by: AsifAmin Co-authored-by: jackie-QLD <39142860+jackie-QLD@users.noreply.github.com> Co-authored-by: William Dutton Co-authored-by: andersmx <44218292+andersmx@users.noreply.github.com> Co-authored-by: Mitchell Anderson Co-authored-by: William Dutton --- .circleci/config.yml | 20 +- gulp/build-tasks/node-docs-flatten.js | 2 +- gulp/build-tasks/other-assets.js | 20 +- gulp/build-tasks/ssi-to-static.js | 48 -- gulp/gulp-config.js | 3 + gulp/release-tasks/files.js | 166 ++--- gulp/release-tasks/node-template-flatten.js | 7 +- gulp/ssi-to-static.js | 51 ++ gulp/test-tasks/lint.js | 15 +- gulpfile.js | 30 +- package.json | 11 +- .../_project/_blocks/components/_misc.scss | 5 + .../components/accordion/_accordion.scss | 18 +- .../_blocks/components/accordion/accordion.js | 90 ++- .../forms/qg-address-autocomplete.js | 2 +- .../_project/_blocks/components/license.js | 2 +- .../components/quick-exit/quick-exit.js | 88 ++- .../layout/_pagemodels/_aggregation.scss | 6 + .../_project/_blocks/layout/_print.scss | 8 +- .../content/content-types/_call-out-box.scss | 4 +- .../_blocks/layout/content/options.html | 4 +- .../_blocks/layout/footer/feedback-form.js | 8 +- .../legacy/site-search-autocomplete.js | 17 +- src/assets/_project/_blocks/qg-main.js | 5 +- .../_project/_blocks/utils/qg-datepicker.js | 20 + src/assets/_project/_blocks/utils/qg-env.js | 15 +- src/assets/_project/_blocks/utils/qg-util.js | 2 +- src/docs/accordion-examples.html | 344 ++++++++++ src/docs/aggregation-page-ex-1.html | 608 ++++++++++++++++++ src/docs/captcha-footer-old.html | 2 +- src/docs/captcha-footer-only.html | 2 +- src/docs/captcha.html | 2 +- src/docs/components.html | 112 +++- src/docs/forms.html | 30 +- src/docs/quick-exit-alt.html | 32 + src/docs/quick-exit.html | 2 +- src/template-pages/aggregation-page.html | 12 +- src/template-pages/index-page.html | 13 + src/template-pages/topic-index-page.html | 13 + tests.webpack.js | 2 - 40 files changed, 1542 insertions(+), 299 deletions(-) delete mode 100644 gulp/build-tasks/ssi-to-static.js create mode 100644 gulp/ssi-to-static.js create mode 100644 src/assets/_project/_blocks/utils/qg-datepicker.js create mode 100644 src/docs/accordion-examples.html create mode 100644 src/docs/aggregation-page-ex-1.html create mode 100644 src/docs/quick-exit-alt.html delete mode 100644 tests.webpack.js diff --git a/.circleci/config.yml b/.circleci/config.yml index 1dd3b0234..afb2797a7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,6 +3,7 @@ jobs: build: docker: - image: circleci/node:10.16.0 + - image: circleci/python:3.7-stretch working_directory: ~/repo @@ -12,9 +13,9 @@ jobs: # Download and cache dependencies - restore_cache: keys: - - v1-dependencies-{{ checksum "package.json" }} - # fallback to using the latest cache if no exact match is found - - v1-dependencies- + - v1-dependencies-{{ checksum "package.json" }} + # fallback to using the latest cache if no exact match is found + - v1-dependencies- - run: name: Workaround for GoogleChrome/puppeteer#290 @@ -36,11 +37,20 @@ jobs: command: | mkdir -p ./test-results/junit yarn test --ci --reporters=jest-junit + - run: + name: Install awscli + command: | + sudo apt update + sudo apt install python-pip + python --version + pip --version + sudo pip install awscli + - run: + name: Deploy to S3 + command: aws s3 sync build s3://testcircleci - store_artifacts: path: ./test-results/junit - store_test_results: path: ./test-results - - diff --git a/gulp/build-tasks/node-docs-flatten.js b/gulp/build-tasks/node-docs-flatten.js index b4e23f7e2..fd0adc89d 100644 --- a/gulp/build-tasks/node-docs-flatten.js +++ b/gulp/build-tasks/node-docs-flatten.js @@ -3,7 +3,7 @@ // Node.js task to convert SSI includes to inline html const path = require('path'); -const ssiToStatic = require('./ssi-to-static.js'); +const ssiToStatic = require('../ssi-to-static.js'); let includeSrc = path.join('build'); let src = path.join('build', 'docs'); diff --git a/gulp/build-tasks/other-assets.js b/gulp/build-tasks/other-assets.js index 1de32bb54..9b0ba88f3 100644 --- a/gulp/build-tasks/other-assets.js +++ b/gulp/build-tasks/other-assets.js @@ -4,31 +4,31 @@ module.exports = function (gulp, plugins, config, es, dest) { return es.merge([ // Images gulp.src(`${config.basepath.src}/assets/_project/images/**/*`).pipe( - gulp.dest(`${config.basepath.build}/${dest}/${config.versionName}/latest/images/`) + gulp.dest(`${config.basepath.build}/${dest}/${config.versionName}/latest/images/`), ), // Libraries - //TODO just handle non js and css (all the js and css to be minified and combined) + //TODO just handle non js and css (all the js and css to be minified and combined) gulp.src(`${config.basepath.src}/assets/_project/lib/**`).pipe( - gulp.dest(`${config.basepath.build}/${dest}/${config.versionName}/latest/lib/`) + gulp.dest(`${config.basepath.build}/${dest}/${config.versionName}/latest/lib/`), ), // concat external js libraries gulp.src(extLibJSTarget) - // .pipe(plugins.debug({title: 'External js:'})) - .pipe(plugins.concat('all-ext-min.js')) - .pipe(plugins.uglify()) - .pipe(gulp.dest(`${config.basepath.build}/${dest}/${config.versionName}/latest/lib/`)), + // .pipe(plugins.debug({title: 'External js:'})) + .pipe(plugins.concat('all-ext-min.js')) + .pipe(plugins.uglify()) + .pipe(gulp.dest(`${config.basepath.build}/${dest}/${config.versionName}/latest/lib/`)), // Fonts gulp.src(`${config.basepath.node_modules}/bootstrap-sass/assets/fonts/**`).pipe( - gulp.dest(`${config.basepath.build}/${dest}/${config.versionName}/latest/fonts`) + gulp.dest(`${config.basepath.build}/${dest}/${config.versionName}/latest/fonts`), ), gulp.src(`${config.basepath.node_modules}/font-awesome/fonts/**`).pipe( - gulp.dest(`${config.basepath.build}/${dest}/${config.versionName}/latest/fonts`) + gulp.dest(`${config.basepath.build}/${dest}/${config.versionName}/latest/fonts`), ), gulp.src([`${config.basepath.src}/docs/**/*.js`, `${config.basepath.src}/docs/**/*.png`, `${config.basepath.src}/docs/**/*.css`, `${config.basepath.src}/docs/**/release-notes/**/*`]) .pipe(plugins.if(dest === 'docs/assets', gulp.dest(`${config.basepath.build}/docs/`))), - gulp.src(config.extLib.transferToBuild) + gulp.src(config.extLib.transferToBuild, { base: './node_modules' }) .pipe(gulp.dest(`${config.basepath.build}/${dest}/${config.versionName}/latest/lib/ext`)), ]); }; diff --git a/gulp/build-tasks/ssi-to-static.js b/gulp/build-tasks/ssi-to-static.js deleted file mode 100644 index 6ad2706ac..000000000 --- a/gulp/build-tasks/ssi-to-static.js +++ /dev/null @@ -1,48 +0,0 @@ -'use strict'; - -// Node.js task to convert SSI includes to inline html -// const path = require('path'); - -module.exports = function (includeSrc, src, dest, exclude) { - const SSI = require('node-ssi'); - const fsPath = require('fs-path'); - // const path = require('path'); - const ssi = new SSI({ - encoding: 'utf-8', - baseDir: includeSrc, // Source of includes - }); - - const folder = { - src: src, // Source path, use path.join - exclude: exclude, - build: dest, // Destination path, use path.join - }; - - fsPath.find(folder.src, function (filepath, stats, filename) { - // filters only html files and excludes folders assigned to folder.exclude - if ((stats === 'file' && /\.html$/.test(filename)) || (stats === 'directory' && folder.exclude.indexOf(filename) < 0)) { - return true; - } - return false; - }, function (err, list) { - if (err) return; - list.files.forEach(function (file) { //iterates through list of filtered files - ssi.compileFile(file, function (err, content) { - if (err) { - console.error(err); - return; - } - var buildFile = file.replace(folder.src, folder.build); //builds destination filepath - fsPath.writeFile(buildFile, content, function (err) { - if (err) { - console.error(err); - } else { - // console.log(buildFile + ' - Done'); - } - }); - }); - }); - }); -}; - -// fromDir(folder.src); diff --git a/gulp/gulp-config.js b/gulp/gulp-config.js index ee16aa1fa..8fe801ef0 100644 --- a/gulp/gulp-config.js +++ b/gulp/gulp-config.js @@ -63,6 +63,9 @@ module.exports = { transferToBuild: [ './node_modules/nodep-date-input-polyfill/nodep-date-input-polyfill.dist.js', './node_modules/stickyfilljs/dist/stickyfill.min.js', + './node_modules/jquery-ui-bundle/jquery-ui.min.css', + './node_modules/jquery-ui-bundle/jquery-ui.min.js', + './node_modules/jquery-ui-bundle/images/**', ], }, publish: { diff --git a/gulp/release-tasks/files.js b/gulp/release-tasks/files.js index 3bc0251f5..337e2e7bd 100644 --- a/gulp/release-tasks/files.js +++ b/gulp/release-tasks/files.js @@ -1,89 +1,97 @@ const cssnano = require('cssnano'); module.exports = function (gulp, plugins, config, es, webpack, path, banner) { - return function () { - const target = [ - `${config.basepath.build}/**/*`, - `!${config.basepath.build}/assets/**/*`, - `!${config.basepath.build}/template-pages/**/*`, - `!${config.basepath.build}/*`, - `!**/${config.versionName}/*.js`, // handled by JS task that minifies - `!**/${config.versionName}/*.css`, // handled by SCSS -> CSS task that minifies - ].concat(config.release.excludes); - const versionAssetsTarget = [ - `${config.basepath.build}/assets/${config.versionName}/**/*`, - `!**/${config.versionName}/**/*.js`, // handled by JS task that minifies - `!**/${config.versionName}/**/*.css`, // handled by SCSS -> CSS task that minifies - ].concat(config.release.excludes); - let includesLink = { - cdnRegex: new RegExp('="(/)?assets/includes-cdn/', 'g'), - localRegex: new RegExp('="(/)?assets/includes-local/', 'g'), - cdnReplacement: '="$1assets/includes-cdn/', - localReplacement: '="$1assets/includes-local/', - }; - - return es.merge([ - gulp.src(target, { dot: true }) - .on('error', console.log) - .pipe(gulp.dest(`${config.basepath.release}`)), + return function () { + const target = [ + `${config.basepath.build}/**/*`, + `!${config.basepath.build}/assets/**/*`, + `!${config.basepath.build}/template-pages/**/*`, + `!${config.basepath.build}/*`, + `!**/${config.versionName}/*.js`, // handled by JS task that minifies + `!**/${config.versionName}/*.css`, // handled by SCSS -> CSS task that minifies + ].concat(config.release.excludes); + const versionAssetsTarget = [ + `${config.basepath.build}/assets/${config.versionName}/**/*`, + `!**/${config.versionName}/**/*.js`, // handled by JS task that minifies + `!**/${config.versionName}/**/*.css`, // handled by SCSS -> CSS task that minifies + ].concat(config.release.excludes); + let includesLink = { + cdnRegex: new RegExp('="(/)?assets/includes-cdn/', 'g'), + localRegex: new RegExp('="(/)?assets/includes-local/', 'g'), + cdnReplacement: '="$1assets/includes-cdn/', + localReplacement: '="$1assets/includes-local/', + }; - //template with include-cdn links - gulp.src(`${config.basepath.build}/template-pages/**/*`, { dot: true }) - .on('error', console.log) - .pipe(plugins.replace(includesLink.localRegex, includesLink.cdnReplacement)) //checks for local includes and replaces with cdn includes - .pipe(gulp.dest(`${config.basepath.release}/template-cdn-ssi`)), - //template with include-local links - gulp.src(`${config.basepath.build}/template-pages/**/*`, { dot: true }) - .on('error', console.log) - .pipe(plugins.replace(includesLink.cdnRegex, includesLink.localReplacement)) //checks for cdn includes and replaces with local includes - .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi`)), + return es.merge([ + gulp.src(target, { dot: true }) + .on('error', console.log) + .pipe(gulp.dest(`${config.basepath.release}`)), - //assets with cdn assets links - gulp.src(`${config.basepath.build}/assets/includes-cdn/**/*`, { dot: true }) - .pipe(gulp.dest(`${config.basepath.release}/template-cdn-ssi/assets/includes-cdn/`)), - //assets with local assets links - gulp.src(`${config.basepath.build}/assets/includes-local/**/*`, { dot: true }) - .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi/assets/includes-local/`)), + //template with include-cdn links + gulp.src(`${config.basepath.build}/template-pages/**/*`, { dot: true }) + .on('error', console.log) + .pipe(plugins.replace(includesLink.localRegex, includesLink.cdnReplacement)) //checks for local includes and replaces with cdn includes + .pipe(gulp.dest(`${config.basepath.release}/template-cdn-ssi`)) + .pipe(gulp.dest(`${config.basepath.release}/template-cdn`)), + //template with include-local links + gulp.src(`${config.basepath.build}/template-pages/**/*`, { dot: true }) + .on('error', console.log) + .pipe(plugins.replace(includesLink.cdnRegex, includesLink.localReplacement)) //checks for cdn includes and replaces with local includes + .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi`)) + .pipe(gulp.dest(`${config.basepath.release}/template-local`)), - //JS task - gulp.src([`${config.basepath.build}/assets/${config.versionName}/**/*.js`, `!${config.basepath.build}/assets/${config.versionName}/**/lib/*.js`], { dot: true }) - .pipe(plugins.foreach(function (stream, file) { - let filename = path.basename(file.path); - let destPath = file.path.split(file.base)[1].split(filename)[0]; - return stream - .pipe(plugins.webpack({ - output: { - filename: filename, - }, - plugins: [new webpack.optimize.UglifyJsPlugin()], - }, webpack)) - .pipe(plugins.insert.prepend(banner)) - .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi/assets/${config.versionName}/${destPath}`)) - .pipe(gulp.dest(`${config.basepath.release}/template-local/assets/${config.versionName}/${destPath}`)) - .pipe(gulp.dest(`${config.basepath.static}/assets/${config.versionName}/${destPath}`)); - })), + //assets with cdn assets links + gulp.src(`${config.basepath.build}/assets/includes-cdn/**/*`, { dot: true }) + .pipe(gulp.dest(`${config.basepath.release}/template-cdn-ssi/assets/includes-cdn/`)), + //assets with local assets links + gulp.src(`${config.basepath.build}/assets/includes-local/**/*`, { dot: true }) + .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi/assets/includes-local/`)), - gulp.src(`${config.basepath.build}/assets/${config.versionName}/latest/lib/all-ext-min.js`) + //JS task + gulp.src([`${config.basepath.build}/assets/${config.versionName}/**/*.js`, `!${config.basepath.build}/assets/${config.versionName}/**/lib/*.js`], { dot: true }) + .pipe(plugins.foreach(function (stream, file) { + let filename = path.basename(file.path); + let destPath = file.path.split(file.base)[1].split(filename)[0]; + return stream + .pipe(plugins.webpack({ + output: { + filename: filename, + }, + plugins: [new webpack.optimize.UglifyJsPlugin()], + }, webpack)) .pipe(plugins.insert.prepend(banner)) - .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi/assets/${config.versionName}/latest/lib/`)) - .pipe(gulp.dest(`${config.basepath.release}/template-local/assets/${config.versionName}/latest/lib/`)) - .pipe(gulp.dest(`${config.basepath.static}/assets/${config.versionName}/latest/lib/`)), + .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi/assets/${config.versionName}/${destPath}`)) + .pipe(gulp.dest(`${config.basepath.release}/template-local/assets/${config.versionName}/${destPath}`)) + .pipe(gulp.dest(`${config.basepath.static}/assets/${config.versionName}/${destPath}`)); + })), - //CSS task - gulp.src(`${config.basepath.build}/assets/${config.versionName}/**/*.css`, { dot: true }) - .pipe(plugins.postcss([cssnano({ - discardComments: {removeAll: true} - })])) - .on('error', console.log) - .pipe(plugins.insert.prepend(banner)) - .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi/assets/${config.versionName}/`)) - .pipe(gulp.dest(`${config.basepath.release}/template-local/assets/${config.versionName}/`)) - .pipe(gulp.dest(`${config.basepath.static}/assets/${config.versionName}/`)), + gulp.src(`${config.basepath.build}/assets/${config.versionName}/latest/lib/all-ext-min.js`) + .pipe(plugins.insert.prepend(banner)) + .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi/assets/${config.versionName}/latest/lib/`)) + .pipe(gulp.dest(`${config.basepath.release}/template-local/assets/${config.versionName}/latest/lib/`)) + .pipe(gulp.dest(`${config.basepath.static}/assets/${config.versionName}/latest/lib/`)), - //other version assets - gulp.src(versionAssetsTarget, { dot: true }) - .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi/assets/${config.versionName}/`)) - .pipe(gulp.dest(`${config.basepath.release}/template-local/assets/${config.versionName}/`)) - .pipe(gulp.dest(`${config.basepath.static}/assets/${config.versionName}/`)), - ]); - }; + //CSS task + gulp.src(`${config.basepath.build}/assets/${config.versionName}/**/*.css`, { dot: true }) + .pipe(plugins.postcss([cssnano({ + discardComments: {removeAll: true}, + })])) + .on('error', console.log) + .pipe(plugins.insert.prepend(banner)) + .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi/assets/${config.versionName}/`)) + .pipe(gulp.dest(`${config.basepath.release}/template-local/assets/${config.versionName}/`)) + .pipe(gulp.dest(`${config.basepath.static}/assets/${config.versionName}/`)), + + //other version assets + gulp.src(versionAssetsTarget, { dot: true }) + .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi/assets/${config.versionName}/`)) + .pipe(gulp.dest(`${config.basepath.release}/template-local/assets/${config.versionName}/`)) + .pipe(gulp.dest(`${config.basepath.static}/assets/${config.versionName}/`)), + + //other version assets + gulp.src(versionAssetsTarget, { dot: true }) + .pipe(gulp.dest(`${config.basepath.release}/template-local-ssi/assets/${config.versionName}/`)) + .pipe(gulp.dest(`${config.basepath.release}/template-local/assets/${config.versionName}/`)) + .pipe(gulp.dest(`${config.basepath.static}/assets/${config.versionName}/`)), + ]); + }; }; diff --git a/gulp/release-tasks/node-template-flatten.js b/gulp/release-tasks/node-template-flatten.js index 2f912821d..032ee3116 100644 --- a/gulp/release-tasks/node-template-flatten.js +++ b/gulp/release-tasks/node-template-flatten.js @@ -1,9 +1,8 @@ 'use strict'; // Node.js task to convert SSI includes to inline html - const path = require('path'); -const ssiToStatic = require('../build-tasks/ssi-to-static.js'); +const ssiToStatic = require('../ssi-to-static.js'); -ssiToStatic(path.join('release', 'template-cdn-ssi'), path.join('release', 'template-cdn-ssi'), path.join('release', 'template-cdn'), []); -ssiToStatic(path.join('release', 'template-local-ssi'), path.join('release', 'template-local-ssi'), path.join('release', 'template-local'), []); +ssiToStatic(path.join('release', 'template-cdn-ssi'), path.join('release', 'template-cdn'), path.join('release', 'template-cdn'), []); +ssiToStatic(path.join('release', 'template-local-ssi'), path.join('release', 'template-local'), path.join('release', 'template-local'), []); diff --git a/gulp/ssi-to-static.js b/gulp/ssi-to-static.js new file mode 100644 index 000000000..3083150a7 --- /dev/null +++ b/gulp/ssi-to-static.js @@ -0,0 +1,51 @@ +'use strict'; + +// Node.js task to convert SSI includes to inline html +const SSI = require('node-ssi'); +const fs = require('fs'); + +/* + * This function loops through a directory recursively to get all the files and filter those to list Html files. + * @dir {string} directory to list all the files + * @files_ {array} files list accumulated recursively +*/ +const getFiles = function (dir, files_) { + files_ = files_ || []; + var files = fs.readdirSync(dir); + for (var i in files) { + var name = dir + '/' + files[i]; + if (fs.statSync(name).isDirectory()) { + getFiles(name, files_); + } else { + if (name && /\.html$/.test(name)) { + files_.push(name); + } + } + } + return files_; +}; + +module.exports = function (includeSrc, src, dest, exclude) { + // const path = require('path'); + const ssi = new SSI({ + encoding: 'utf-8', + baseDir: includeSrc, // Source of includes + }); + + let filesList = getFiles(src); + filesList.forEach(function (file) { + ssi.compileFile(file, function (err, content) { + if (err) { + console.error(err); + return; + } + fs.writeFile(file, content, function (err) { + if (err) { + console.error(err); + } else { + // console.log(buildFile + ' - Done'); + } + }); + }); + }); +}; diff --git a/gulp/test-tasks/lint.js b/gulp/test-tasks/lint.js index e2ff7ebd5..f1921bf16 100644 --- a/gulp/test-tasks/lint.js +++ b/gulp/test-tasks/lint.js @@ -1,15 +1,12 @@ var gulpif = require('gulp-if'); -module.exports = function (gulp, plugins, config, fsPath, eslintReporter) { +module.exports = function (gulp, plugins, config) { return () => { return gulp.src(config.test.lint) - .once('data', function () { console.log('\x1b[1m', ' \n---linting tests---\n '); }) - .pipe(plugins.eslint({ - configFile: '.eslintrc', - })) + .once('data', function () { console.log('\x1b[1m', ' \n---linting tests---\n '); }) + .pipe(plugins.eslint({ + configFile: '.eslintrc', + })) .pipe(plugins.eslint.format()) - .pipe(gulpif(process.env.NODE_ENV === 'prod', plugins.eslint.failAfterError())) - .pipe(plugins.eslint.format(eslintReporter, function (results) { - fsPath.writeFile('tests/reports/eslint/report.html', results); - })); + .pipe(gulpif(process.env.NODE_ENV === 'prod', plugins.eslint.failAfterError())); }; }; diff --git a/gulpfile.js b/gulpfile.js index f39ac269f..524c0909d 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -16,8 +16,6 @@ const path = require('path'); const addSrc = require('gulp-add-src'); // For testing -const fsPath = require('fs-path'); -const eslintReporter = require('eslint-html-reporter'); const connectssi = require('gulp-connect-ssi'); const connect = require('gulp-connect'); // const wait = require('gulp-wait'); @@ -72,18 +70,18 @@ gulp.task('assets-includes-cdn', require('./gulp/build-tasks/assets-includes')(g gulp.task('build', (cb) => { runSequence( - 'test:eslint', - 'assets-includes-docs', - 'assets-includes-cdn', - 'assets-includes-local', - 'template-pages', - 'js', - 'scss', - 'other-assets', - 'build-other-files', - 'template-pages-docs', - 'template-pages-to-docs', - cb + 'test:eslint', + 'assets-includes-docs', + 'assets-includes-cdn', + 'assets-includes-local', + 'template-pages', + 'js', + 'scss', + 'other-assets', + 'build-other-files', + 'template-pages-docs', + 'template-pages-to-docs', + cb, ); }); @@ -124,7 +122,7 @@ gulp.task('release', (cb) => { 'scss-src', 'release-other-files', ], - cb + cb, ); }); @@ -133,7 +131,7 @@ let randomPort = Math.floor(1000 + Math.random() * 9000); gulp.task('serve', require('./gulp/build-tasks/serve')(gulp, plugins, connect, connectssi, argv, path, randomPort)); /* TEST TASKS */ -gulp.task('test:eslint', require('./gulp/test-tasks/lint')(gulp, plugins, config, fsPath, eslintReporter)); +gulp.task('test:eslint', require('./gulp/test-tasks/lint')(gulp, plugins, config)); /* PUBLISH TASKS */ diff --git a/package.json b/package.json index 1a8457bb1..486fa8cb8 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "Queensland-Government-Web-Template", - "version": "3.1.9", - "subVersion": "1.0.10", - "wt-version": "3.1.9", + "version": "3.1.10", + "subVersion": "1.0.11", + "wt-version": "3.1.10", "description": "This template is designed to provide a template for all Franchise websites, and the underpinning technology for new Agency websites.", "main": "gulpfile.js", "repository": { @@ -18,7 +18,7 @@ "prerelease": "gulp clean-release", "release": "export NODE_ENV=prod && npm run build && gulp release && node gulp/release-tasks/node-template-flatten.js && gulp replace-links", "postrelease": "gulp clean-redundant-release", - "start": "yarn build && gulp watch", + "start": "npm run build && gulp watch", "watch": "gulp watch", "publish-npm": "gulp wt-clean && gulp wt-clone && gulp wt-sync && gulp wt-updateVersion && gulp wt-npm && gulp wt-add && gulp wt-commit && gulp wt-tag && gulp wt-push", "create-swe-release": "gulp swe-add && gulp swe-tag && gulp swe-commit && gulp swe-push", @@ -51,8 +51,6 @@ "extract-text-webpack-plugin": "^2.1.0", "file-loader": "^2.0.0", "font-awesome": "^4.7.0", - "fs": "0.0.1-security", - "fs-path": "0.0.24", "git-hooks": "^1.1.8", "gulp": "^3.9.0", "gulp-add-src": "^0.2.0", @@ -110,6 +108,7 @@ "chromium": "^2.1.1", "dotenv": "^4.0.0", "jquery": "^3.3.1", + "jquery-ui-bundle": "^1.12.1-migrate", "lato-webfont": "^2.15.1", "node-bourbon": "^4.2.8", "nodep-date-input-polyfill": "^5.2.0", diff --git a/src/assets/_project/_blocks/components/_misc.scss b/src/assets/_project/_blocks/components/_misc.scss index 369f64846..19f5e0d30 100644 --- a/src/assets/_project/_blocks/components/_misc.scss +++ b/src/assets/_project/_blocks/components/_misc.scss @@ -23,3 +23,8 @@ a{ color: #fff; } } + +// datepicker prev and next button positioning +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next, .ui-datepicker .ui-datepicker-next-hover { + top: 8px !important; +} diff --git a/src/assets/_project/_blocks/components/accordion/_accordion.scss b/src/assets/_project/_blocks/components/accordion/_accordion.scss index 6373cef3c..d9ff8335d 100644 --- a/src/assets/_project/_blocks/components/accordion/_accordion.scss +++ b/src/assets/_project/_blocks/components/accordion/_accordion.scss @@ -5,13 +5,22 @@ .qg-acc-controls{ text-align: right; margin-bottom: 0.4em; + button{ + border: none; + background: none; + color: #13578b!important; + font-weight: 700; + } a{ text-decoration: none !important; - padding: 0 0.7rem; + padding: 0.4rem 0.7rem; color: $qg-blue-dark !important; font-weight: bold; display: inline-block; } + .collapse:not(.show) { + display: inline; + } } //label selector is to provide backward compatibility in case projects are using old markup label[for="expand"], label[for="collapse"] { @@ -40,9 +49,14 @@ border-bottom: 1px solid $qg-light-gray; } .acc-heading { - margin: 5px; + //margin: 5px; position: relative; padding: 0.6rem 0.7rem; + width: 98.5%; + margin:5px; + background: transparent; + border:none; + text-align:left; .title{ display: block; &:hover { diff --git a/src/assets/_project/_blocks/components/accordion/accordion.js b/src/assets/_project/_blocks/components/accordion/accordion.js index 117ee0f04..cb22d0c5b 100644 --- a/src/assets/_project/_blocks/components/accordion/accordion.js +++ b/src/assets/_project/_blocks/components/accordion/accordion.js @@ -8,12 +8,26 @@ (function ($) { let accordion = '.qg-accordion'; if ($(accordion).length > 0) { - let tabindex = 1; let accordionControls = 'input[name=control]'; + let accItem = $(accordion).find('article'); let linkedpanel = window.location.hash && $('input[aria-controls=' + window.location.hash.substring(1) + ']'); + // keyboard accessibility + var a11yClick = function (event) { + if (event.type === 'click') { + return true; + } else if (event.type === 'keypress') { + var code = event.charCode || event.keyCode; + if ((code === 32) || (code === 13)) { + return true; + } + } else { + return false; + } + }; + //Handle events of accordion inputs - $(accordion).find('article input').on('change', function () { + $(accordion).find('article input[name=tabs]').on('change', function () { let checkedStatus = $(this).prop('checked'); let controlledPanedId = $('#' + $(this).attr('aria-controls')); $(this) @@ -22,21 +36,6 @@ controlledPanedId.attr('aria-hidden', !checkedStatus); }); - //expand all click - // label selector is to provide backward compatibility in case projects are using old markup - $('.qg-acc-controls .expand, label[for=\'expand\']').click(function (e) { - e.preventDefault(); - $(this).focus(); - $(this).parents('.qg-accordion').find('input:checkbox').prop('checked', true); - }); - - // collapse all click - // label selector is to provide backward compatibility in case projects are using old markup - $('.qg-acc-controls .collapse, label[for=\'collapse\']').click(function (e) { - e.preventDefault(); - $(this).parents('.qg-accordion').find('input:checkbox').prop('checked', false); - }); - // open on page load const hashTrigger = function () { linkedpanel = window.location.hash && $('input[aria-controls=' + window.location.hash.substring(1) + ']'); @@ -51,25 +50,62 @@ hashTrigger(); window.onhashchange = hashTrigger; - // inserting tab index dynamically - // label selector is to provide backward compatibility in case projects are using old markup - $('.qg-accordion .acc-heading, .qg-acc-controls .expand, .qg-acc-controls .collapse, label[for="expand"], label[for="collapse"]').each(function () { - if (this.type !== 'hidden') { - var $input = $(this); - $input.attr('tabindex', tabindex); - tabindex++; - } - }); $('input[name=tabs]').click(function () { $(this).parent('article').find('.acc-heading').focus(); }); // highlight title on hover - $('.qg-accordion article').hover(function () { + accItem.hover(function () { $(accordion).find('.title').removeClass('ht'); $(this).find('.title').addClass('ht'); }, function () { $(accordion).find('.title').removeClass('ht'); }); + + // expand/collapse on enter keypress + accItem.find('.acc-heading').on('keypress', function (event) { + if (event.target === event.currentTarget) { + event.preventDefault(); + if (a11yClick(event) === true) { + let parent = $(this).parent(); + if (parent.find('input[name="tabs"]:checked').length > 0) { + parent.find('input[name="tabs"]').prop('checked', false); + } else { + parent.find('input[name="tabs"]').prop('checked', true); + } + } + } + }); + accItem.find('.acc-heading').on('click', function (event) { + if (event.target === event.currentTarget) { + if (event.clientX !== 0) { + let parent = $(this).parent(); + if (parent.find('input[name="tabs"]:checked').length > 0) { + parent.find('input[name="tabs"]').prop('checked', false); + } else { + parent.find('input[name="tabs"]').prop('checked', true); + } + return false; + } + } + }); + //expand all click + // label selector is to provide backward compatibility in case projects are using old markup + $('.qg-acc-controls .expand, label[for=\'expand\']').on('click keypress', function (event) { + if (a11yClick(event) === true) { + $(this).parents('.qg-accordion').find('input:checkbox').prop('checked', true); + event.preventDefault(); + } + }); + + // collapse all click + // label selector is to provide backward compatibility in case projects are using old markup + $('.qg-acc-controls .collapse, label[for=\'collapse\']').on('click keypress', function (event) { + if (a11yClick(event) === true) { + $(this).parents('.qg-accordion').find('input:checkbox').prop('checked', false); + event.preventDefault(); + } + }); } }(jQuery)); + diff --git a/src/assets/_project/_blocks/components/forms/qg-address-autocomplete.js b/src/assets/_project/_blocks/components/forms/qg-address-autocomplete.js index 905a9ee85..5bab8eb1b 100644 --- a/src/assets/_project/_blocks/components/forms/qg-address-autocomplete.js +++ b/src/assets/_project/_blocks/components/forms/qg-address-autocomplete.js @@ -212,4 +212,4 @@ let qgInitAutocompleteAddress; }; qg.loadGoogle(qgInitAutocompleteAddress); } -}(qg, jQuery)); +}(qg, jQuery)); \ No newline at end of file diff --git a/src/assets/_project/_blocks/components/license.js b/src/assets/_project/_blocks/components/license.js index 2598c81e3..f59a68bcd 100644 --- a/src/assets/_project/_blocks/components/license.js +++ b/src/assets/_project/_blocks/components/license.js @@ -7,7 +7,7 @@ 'use strict'; const licenceOptions = { url: '//creativecommons.org/licenses/', - imgSrc: qg.cdn + qg.swe.paths.images + '/licences/', + imgSrc: '{{CDN}}/latest/images/licences/', types: { 'by': { 'name': 'Attribution', diff --git a/src/assets/_project/_blocks/components/quick-exit/quick-exit.js b/src/assets/_project/_blocks/components/quick-exit/quick-exit.js index 69c8aef9b..5ee951e66 100644 --- a/src/assets/_project/_blocks/components/quick-exit/quick-exit.js +++ b/src/assets/_project/_blocks/components/quick-exit/quick-exit.js @@ -1,31 +1,61 @@ -var quickExit = { - el: '.qg-quick-exit', - init: function () { - this.methods(); - }, - methods: function () { - var newloc = 'https://www.google.com.au'; - var el = $(this.el); - if (el.length > 0) { - $.getScript('{{CDN}}/latest/lib/ext/stickyfill.min.js', function () { - // IE 11 fix - /*global Stickyfill*/ - Stickyfill.add(el); - // navigating on pressing Escape key - $(document).keydown(function (e) { - if (e.keyCode === 27) { - window.open(newloc, '_blank', ''); - window.location.replace(newloc); - return false; - } - }); - // clicking on the quick exit button - $('body').on('click', '.qg-quick-exit__button', function () { - window.open(newloc, '_blank', ''); - window.location.replace(newloc); + +(function () { + var $quickExit = $('.qg-quick-exit'); + if ($quickExit.length > 0 && $('.qg-quick-exit__button').length > 0) { + var quickExitInit = function () { + var button = document.querySelector('.qg-quick-exit__button'); + var escapeSite = 'https://www.google.com.au/'; + var hotkey = 27; + + // add click handler + button.onclick = function (e) { + /*globals quickExit*/ + return quickExit(escapeSite); + }; + + // load a plugin only on IE browser to support position:sticky + if (/MSIE \d|Trident.*rv:/.test(navigator.userAgent)) { + $.getScript('{{CDN}}/latest/lib/ext/stickyfilljs/dist/stickyfill.min.js', function () { + /*global Stickyfill*/ + console.log('loaded stickyfill'); + Stickyfill.add($quickExit); }); + } + + // add hotkey trigger + document.addEventListener('keydown', function (e) { + if (e.keyCode === hotkey) { + quickExit(escapeSite); + + if (e) { + // stop escape from cancelling redirect + e.preventDefault(); + + // early IEs don't have preventDefault + e.returnValue = false; + } + + return false; + } }); - } - }, -}; -quickExit.init(); + }; + window.quickExit = function (site) { + // then redirect to a non-sensitive site + window.open(site, '_blank'); + window.location.replace(site); + + // remove as much info from URL as possible + if (window.history) { + try { + window.history.replaceState({}, '', '/'); + } catch (e) { + + } + } + + // disable default event handling + return false; + }; + quickExitInit(); + } +})(); diff --git a/src/assets/_project/_blocks/layout/_pagemodels/_aggregation.scss b/src/assets/_project/_blocks/layout/_pagemodels/_aggregation.scss index ffa2e235f..2395f774a 100644 --- a/src/assets/_project/_blocks/layout/_pagemodels/_aggregation.scss +++ b/src/assets/_project/_blocks/layout/_pagemodels/_aggregation.scss @@ -1,4 +1,10 @@ .aggregation-index { + #qg-primary-content { + margin-top: 2rem; + } + .qg-primary-content_notice { + margin-bottom: 2rem; + } .additional-information { h2 { font-size: 1.56rem; diff --git a/src/assets/_project/_blocks/layout/_print.scss b/src/assets/_project/_blocks/layout/_print.scss index 420fa22db..53e74dbaa 100644 --- a/src/assets/_project/_blocks/layout/_print.scss +++ b/src/assets/_project/_blocks/layout/_print.scss @@ -101,6 +101,12 @@ background: #ffffff; color: #000000; } + .row { + display: block; + } + .qg-site-map { + display:none !important; + } #qg-primary-content{ margin-top: 0; h1 { @@ -273,4 +279,4 @@ form .label { border: none; } -} \ No newline at end of file +} diff --git a/src/assets/_project/_blocks/layout/content/content-types/_call-out-box.scss b/src/assets/_project/_blocks/layout/content/content-types/_call-out-box.scss index 98f47e5f6..1fda499d8 100644 --- a/src/assets/_project/_blocks/layout/content/content-types/_call-out-box.scss +++ b/src/assets/_project/_blocks/layout/content/content-types/_call-out-box.scss @@ -4,7 +4,7 @@ padding: 2em 1em; width: 100%; box-sizing: border-box; - margin: 1em auto; + margin: 0 auto; overflow: hidden; a.qg-btn { float: left; @@ -17,4 +17,4 @@ p { margin: 0; } -} \ No newline at end of file +} diff --git a/src/assets/_project/_blocks/layout/content/options.html b/src/assets/_project/_blocks/layout/content/options.html index 27510955a..090a4b9b6 100644 --- a/src/assets/_project/_blocks/layout/content/options.html +++ b/src/assets/_project/_blocks/layout/content/options.html @@ -14,7 +14,7 @@ method="post" action="https://www.smartservice.qld.gov.au/services/submissions/email/feedback/feedback" class="form" - data-recaptcha="true"> + data-recaptcha="true" data-action="homepage">
  1. @@ -107,6 +107,8 @@

    Page feedback

    2. + ` +
  2. diff --git a/src/assets/_project/_blocks/layout/footer/feedback-form.js b/src/assets/_project/_blocks/layout/footer/feedback-form.js index a01d28b4b..320aba337 100644 --- a/src/assets/_project/_blocks/layout/footer/feedback-form.js +++ b/src/assets/_project/_blocks/layout/footer/feedback-form.js @@ -40,7 +40,13 @@ function addHiddenInput (key, val) { $('#feedback-hidden-inputs').append(newHiddenInput); } function init (franchiseTitle) { - addHiddenInput('franchise', location.pathname.split('/')[1]); + var franchise; + if (franchiseTitle) { + franchise = franchiseTitle; + } else { + franchise = location.pathname.split('/')[1]; + } + addHiddenInput('franchise', franchise); addHiddenInput('page-title', $(document).find('title').text()); addHiddenInput('page-url', window.location.href); addHiddenInput('page-referer', document.referrer); diff --git a/src/assets/_project/_blocks/legacy/site-search-autocomplete.js b/src/assets/_project/_blocks/legacy/site-search-autocomplete.js index 37595330a..c9e91a4c6 100644 --- a/src/assets/_project/_blocks/legacy/site-search-autocomplete.js +++ b/src/assets/_project/_blocks/legacy/site-search-autocomplete.js @@ -23,8 +23,10 @@ $(function () { } $('.qg-web-autocomplete').each(function () { var form = this; - var searchField = $(form.elements.query).filter('[name="query"]'); + var searchField = $(form.elements).filter('[name="query"]'); // var lastSearch = searchField.val(); + var profile = $(form.elements).filter('[name="profile"]').val() || 'qld_preview'; + var submit = $(form.elements).filter('[type="submit"]'); var userTyped = ''; // ARIA @@ -40,6 +42,10 @@ $(function () { // create the suggestion box var suggestions = $('
      ').generateId('suggestbox'); + if (profile.length > 0 && submit.length > 0) { + submit.attr('data-analytics-link-group', 'qg-search-submit-from-' + profile); + } + function closeSuggestions () { suggestions.empty(); suggestions.attr('aria-busy', 'true'); @@ -130,22 +136,21 @@ $(function () { searchField.attr('aria-owns', suggestions.attr('id')); userTyped = this.value; + if (userTyped.length < 3) { closeSuggestions(); return; } // console.log( 'fetch suggestions for ', userTyped ); - $.ajax({ // cache! (the URL will be change with the search text) cache: true, dataType: 'jsonp', url: 'https://find.search.qld.gov.au/s/suggest.json?', data: { - // TODO read these from search form collection: $(form.elements.collection).filter('[name="collection"]').val() || 'qld-gov', - profile: $(form.elements.profile).filter('[name="profile"]').val() || 'qld_preview', + profile: profile || 'qld_preview', show: MAX_SUGGESTIONS, partial_query: userTyped, }, @@ -164,7 +169,7 @@ $(function () { suggestions.html($.map(data, function (value) { var htmlValue = value.replace(/' + safeInput + ''); // use form.action + default params - return '
    • ' + htmlValue + '
      • '; + return '
    • ' + htmlValue + '
      • '; }).join('\n')); // issue #3: issues with typing over selected suggestion @@ -183,4 +188,4 @@ $(function () { // hover over selection = update 'placeholder' style text }); }); -}); // onready +}); // onready \ No newline at end of file diff --git a/src/assets/_project/_blocks/qg-main.js b/src/assets/_project/_blocks/qg-main.js index c5a2219c5..0f24a3c00 100644 --- a/src/assets/_project/_blocks/qg-main.js +++ b/src/assets/_project/_blocks/qg-main.js @@ -1,6 +1,5 @@ // env initialization -import qg from './utils/qg-env'; - +import './utils/qg-env'; // utils import import './utils/qg-util'; @@ -22,7 +21,7 @@ import feedbackForm from './layout/footer/feedback-form'; (function () { 'use strict'; - let franchiseTitle = qg && qg.swe && qg.swe.franchiseTitle; + let franchiseTitle = window.qg.swe.franchiseTitle; activeSideNav.highlightNavItem(); stepNav.init(); feedbackForm.init(franchiseTitle); diff --git a/src/assets/_project/_blocks/utils/qg-datepicker.js b/src/assets/_project/_blocks/utils/qg-datepicker.js new file mode 100644 index 000000000..ea05eff70 --- /dev/null +++ b/src/assets/_project/_blocks/utils/qg-datepicker.js @@ -0,0 +1,20 @@ +function browserSupportsDateInput () { + var i = document.createElement('input'); + i.setAttribute('type', 'date'); + return i.type !== 'text'; +} +if (!browserSupportsDateInput() && $('input[type=\'date\']').length > 0) { + $.getScript('{{CDN}}/latest/lib/ext/nodep-date-input-polyfill/nodep-date-input-polyfill.dist.js', function () { + console.log('date polyfill loaded'); + }); +} +if ($('input[class=\'qg-date-input\']').length > 0) { + $.getScript('{{CDN}}/latest/lib/ext/jquery-ui-bundle/jquery-ui.min.js', function () { + $('head').append($("")); + $('.qg-date-input').datepicker({ + dateFormat: 'dd/mm/yy', + changeYear: true, + changeMonth: true, + }); + }); +} diff --git a/src/assets/_project/_blocks/utils/qg-env.js b/src/assets/_project/_blocks/utils/qg-env.js index dbda59422..16c307c24 100644 --- a/src/assets/_project/_blocks/utils/qg-env.js +++ b/src/assets/_project/_blocks/utils/qg-env.js @@ -1,10 +1,7 @@ -// All the environment related SWE3 code +var env = (function () { + // All the environment related SWE3 code + window.qg = window.qg || {}; + window.qg.swe = window.qg.swe || {}; +})(); -window.qg = window.qg || {}; -window.qg.swe = window.qg.swe || {}; -window.qg.cdn = window.qg.swe.isProduction === false ? 'https://beta-static.qgov.net.au' : 'https://static.qgov.net.au'; -window.qg.swe.assets = '/assets/v3.1/latest/'; - -window.qg.swe.paths = { - images: window.qg.swe.assets + 'images', -}; +module.exports = env; diff --git a/src/assets/_project/_blocks/utils/qg-util.js b/src/assets/_project/_blocks/utils/qg-util.js index 01d289ba5..88ef9276a 100644 --- a/src/assets/_project/_blocks/utils/qg-util.js +++ b/src/assets/_project/_blocks/utils/qg-util.js @@ -2,4 +2,4 @@ import './qg-misc'; import './qg-ajax-call'; import './qg-load-google-api'; import './parent-width'; -import './qg-date-ie-support'; +import './qg-datepicker'; diff --git a/src/docs/accordion-examples.html b/src/docs/accordion-examples.html new file mode 100644 index 000000000..24137700b --- /dev/null +++ b/src/docs/accordion-examples.html @@ -0,0 +1,344 @@ + + + + + + + + + Add your heading | Queensland Government + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + +
      + + + + + + + + + +
      + +
      +
      + + + + + +
      + + Print + + + + +

      Regional Communities Climate Heroes

      + + + + + + + + + + + + + +

      Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ad aliquam aperiam beatae blanditiis consectetur cupiditate dignissimos dolore doloribus earum eos labore mollitia nam nemo officiis, quaerat quo rem, ullam vitae!

      +
      + + + + + +
      + +

      Traditional Family Group, Barcaldine

      +

      + +
      + Duration 1:01 +
      + +
      + +
      +
      + +
      +
      + + + +
      +
      + + + + + + +
      +

      Traditional Family Group is in Indigenous-run cleaning and maintenance business in Barcaldine, Central Western Queensland.

      The business won the contract to maintain the Barcaldine Solar Farm in Central West Queensland, which consists of 80,000 panels that need to be cleaned on a daily basis to ensure optimal power.

      Traditional Family Group is now looking at expanding its business to maintain other solar farms in the area, demonstrating how renewable energy projects can be good for local enterprises.

      • Traditional Family Group began as a local cleaning business in Barcaldine in Central West Queensland
      • It is run by Janeece Thompson and her family, who are Bidjara/Kara-Kara Custodians of the area, and employs nine people from the local community.
      • When the Barcaldine Solar Farm was built, Janeece approached the owners and asked if they needed cleaning services for the staff kitchen.
      • Instead they were awarded the contract to maintain the entire grounds, including cleaning 80,000 solar panels on a regular basis.
      • Traditional Family Group is now looking at expanding to maintain other solar farms in the area, which presents a major opportunity for the business as the region becomes a hub for renewable energy.

      RAPAD, Central West Queensland

      The Central West Remote Area Planning and Development Board (RAPAD) has a vision to capitalise on Queensland’s shift to a low carbon economy by generating the state’s electricity needs through renewable energy projects, bringing transformative benefits to a region that has been hit hard by drought.

      Headquartered in Longreach, RAPAD’s mission is to foster, facilitate and promote the growth of Central Western Queensland, where populations and livelihoods are under increasing pressure.

      • RAPAD hopes to ensure a viable future for remote Queensland by exploring new pathways that will bring greater resilience and prosperity to the region.
      • RAPAD wants to capitalise on the natural assets of the Central West, which include space, sunshine and considerable geothermal reserves, to become a hub for renewable energy.
      • Benefits include local employment in the construction and maintenance of renewable energy projects, bringing new skills and training to local workforces.
      • Over $100 million has already been invested in renewable energy projects in the Central West, with the region’s natural advantages set to make it a hub for energy intensive industries.
      • RAPAD is exploring future possibilities such as the establishment of micro-grids to enable local businesses and residential populations to access reliable, cheap and locally-generated renewable energy.

      Siena Catholic College, Sippy Downs

      + + + +
      Siena Catholic College solar panels
      +

      In 2016, Siena Catholic College at Sippy Downs on the Sunshine Coast was looking for a way to reduce energy costs, reduce CO2 emissions and provide a more sustainable campus.

      The school engaged Planet Ark Power to create a large-scale solar system, consisting of 80 KW of rooftop solar using 308 solar panels and 3 inverters. Since installing the system in 2016, the school has achieved the following benefits:

      • Anticipated generation of 120,000 kWh to mitigate against cost of future energy price rises
      • Estimated annual savings of $20,000 in energy costs
      • Estimated annual emission savings of 92 tonnes of carbon (the equivalent 500,000 kms travelled by car).

      Lemontree feedlot, Darling Downs

      + + + +
      McNamee Lemontree Feedlot
      +

      The Lemontree feedlot is a beef and dairy feeding facility in the Darling Downs, 200 km west of Brisbane. The owners, McNamee Partners, were looking for ways to reduce costs and make its business more successful.

      As electricity is the largest operating cost after wages, the business set out to reduce grid energy demand by installing a solar energy system made up of 960 solar panels.

      • Planet Ark Power ensured the project was completed with a no upfront payment lease whereby the savings on energy costs from the system less the lease payments is cashflow positive from day one.
      • McNamee will acquire ownership of the system after seven years of the lease term, then once owned and the lease ends have another 15 to 20 years of essentially free energy.
      • McNamee gets electricity price and supply security for the next 20 to 25 years, lowering the risk to the business of any large energy price increases.

      What regional businesses can do

      Find out how you can take advantage of new opportunities in the low carbon economy.

      • Reduce your energy bills
      • Calculate your carbon footprint
      • Offset your carbon emissions
      • Reduce your waste
      • Educate your customers about sustainable practices.

      If you’re already enjoying the benefits of greater sustainability, we’d love to hear your story. Contact us at climatechange@des.qld.gov.au

      Additional resources

      + + + + + + + + + + +
      + +
      +
      + +
      +
      + + | + +
      +
      + + + +
      +
      + + + +
      +
      + + + +
      +
      + + + +
      +
      + + + +
      + + +
      + +
      + + + +
      + + +
      + + + + + + +
      +
      Last updated:
      +
      30 May 2019
      +
      + + +
      + + + + + + + + + +
      + + + + + +
      + + +
      + +
      + + +
      +
      + + + + + + + + diff --git a/src/docs/aggregation-page-ex-1.html b/src/docs/aggregation-page-ex-1.html new file mode 100644 index 000000000..c4022e83b --- /dev/null +++ b/src/docs/aggregation-page-ex-1.html @@ -0,0 +1,608 @@ + + + + + + + + + + + + + + + maiores nesciunt rem repellendus sapiente. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      + + +
      +
      + + + + +
      +
      +
      + + + + + +
      + + +
      + + + + + + + + + + + + + +
      +
      +

      State Penalties Enforcement Registry

      +

      Got a SPER debt?

      + + + Make a payment +
      +
      + + + +
      + + + + + + + + + + + + + + + + +
      + +
      +
      +
      + Image of a clipboard with ticked boxes

      Lorem ipsum dolor sit amet, consectetur adipisicing elit.

      +
      +
      +
      + + +
      +
      + +
      +

      About the Great Barrier Reef first

      +

      Lorem ipsum dolor sit amet, consectetur adipisicing elit. Atque dicta ea eius eligendi + exercitationem sequi? Architecto delectus doloremque eos error id natus necessitatibus + perferendis quas, reprehenderit, rerum sequi similique ut! Architecto delectus doloremque eos error id natus necessitatibus + perferendis quas, reprehenderit, rerum sequi similique ut

      + + More about the reef +
      +
      +
      +
      +
      + +
      +

      About the Great Barrier Reef first

      +

      Adding the class ‘qg-pin-bottom’ will make the button sticks to the bottom of the card. This can be helpful if you are concerned that buttons appearing at different heights are creating visual confusion. No effect on mobile.

      + More about the reef +
      +
      +
      +
      +
      + +
      +

      About the Great Barrier Reef first

      +

      Lorem ipsum dolor sit amet, consectetur adipisicing elit. Atque dicta ea eius eligendi + exercitationem sequi? Architecto delectus doloremque eos error id natus necessitatibus + perferendis quas, reprehenderit, rerum sequi similique ut! Architecto delectus doloremque eos error id natus necessitatibus + perferendis quas, reprehenderit, rerum sequi similique ut!

      + More about the reef +
      +
      +
      +
      +
      + +
      +

      About the Great Barrier Reef first

      +

      Lorem ipsum dolor sit amet, consectetur adipisicing elit. Atque dicta ea eius eligendi + exercitationem sequi? Architecto delectus doloremque eos error id natus necessitatibus + perferendis quas, reprehenderit, rerum sequi similique ut!

      + More about the reef +
      +
      +
      +
      + + + + + + + + + + +
      + + + + + + + + + +
      + + + + + + + + + + + + + + + + +
      + + + + +
      + + + + + + + +
      +
      +
      + +
      + +
      +
      +
      + +
      + +
      + +
        +
      1. +
        + Is your feedback about: +
        + + +
        +
        + + +
        +
        +
        2. +
      + +
      + +
      +

      Feedback on government services, departments and staff

      +

      Please use our complaints and compliments form.

      +
      + +
      + +

      Page feedback

      + +
        + +
      1. + +
        + + + How satisfied are you with your experience today? + * + +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        +
        + + +
        + +
        +
        2. + +
      2. +
        + + +
        +
        3. + +
      3. +
        + + +
        +
        4. + +
      4. + + +
          + +
        • + +
          • + +
        +

        + This site is protected by reCAPTCHA and the Google + Privacy Policy and + Terms of Service apply. +

        + +
        5. + +
      + +
      + +
      + +
      + +
      +
      + +
      + + + + + + + +
      + +
      + + +
      + + +

      © The State of Queensland 1995–2020

      +

      Queensland Government

      +
      + + + + + +
      +
      + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/docs/captcha-footer-old.html b/src/docs/captcha-footer-old.html index d1ba87646..b872e5afc 100644 --- a/src/docs/captcha-footer-old.html +++ b/src/docs/captcha-footer-old.html @@ -72,7 +72,7 @@
      - + diff --git a/src/docs/captcha-footer-only.html b/src/docs/captcha-footer-only.html index dfcc313cf..cd008c055 100644 --- a/src/docs/captcha-footer-only.html +++ b/src/docs/captcha-footer-only.html @@ -73,7 +73,7 @@
      - + diff --git a/src/docs/captcha.html b/src/docs/captcha.html index ff876e690..189bb8177 100644 --- a/src/docs/captcha.html +++ b/src/docs/captcha.html @@ -72,7 +72,7 @@
      - + diff --git a/src/docs/components.html b/src/docs/components.html index 28246b2b9..8cec2d881 100644 --- a/src/docs/components.html +++ b/src/docs/components.html @@ -1,6 +1,6 @@ - + @@ -71,8 +71,7 @@
      - - +

      Components

      Reusable components for your Queensland Government websites and web applications

      @@ -86,25 +85,100 @@

      Accordion

      Click headers to expand/collapse content that is categorised into logical sections.

      - Expand all + | - Collapse all +
      - -

      + +
      - -

      + +