From 0aec43142eadcf6f64fa45a6c8c215902fdc11f2 Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Wed, 8 Feb 2023 13:39:50 +1000 Subject: [PATCH 1/4] [QOLDEV-268] skip unwanted spacing after list items - Don't apply margin-bottom to list items in contexts that manage their own spacing --- src/assets/_project/_blocks/layout/content/_content.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/_project/_blocks/layout/content/_content.scss b/src/assets/_project/_blocks/layout/content/_content.scss index b2eaa85df..6af5d47bd 100644 --- a/src/assets/_project/_blocks/layout/content/_content.scss +++ b/src/assets/_project/_blocks/layout/content/_content.scss @@ -26,8 +26,8 @@ font-size: 1rem; } ul, ol { - // don't add margins to elements styled by JavaScript - li:not(.select2 li) { + // don't add margins to contexts that manage their own spacing + li:not(.select2 li, .graph li, #tabbed-nav li) { margin-bottom: 0.5em; } } From 864d48a81a2adf6490d0f12ad3427a618334d85a Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Wed, 8 Feb 2023 11:35:41 +1000 Subject: [PATCH 2/4] [QOLDEV-268] add storybook page for Digital Dashboard tenders - This will help us track changes and detect regressions on the Digital Dashboard. --- .../digital-dashboard/Dashboard.stories.mdx | 25 +++++ .../digital-dashboard/templates/Tenders.html | 94 +++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 src/stories/franchises/digital-dashboard/Dashboard.stories.mdx create mode 100644 src/stories/franchises/digital-dashboard/templates/Tenders.html diff --git a/src/stories/franchises/digital-dashboard/Dashboard.stories.mdx b/src/stories/franchises/digital-dashboard/Dashboard.stories.mdx new file mode 100644 index 000000000..8284e13a2 --- /dev/null +++ b/src/stories/franchises/digital-dashboard/Dashboard.stories.mdx @@ -0,0 +1,25 @@ +import { Canvas, Meta, Story } from "@storybook/addon-docs"; + +import Tenders from "./templates/Tenders.html"; + +import { QgPrimaryContent, QgContent } from "../../decorators"; + +import { getDecoratedParameters } from "../../helpers"; + + + +# Digital Dashboard + +This story mimics component usages on https://www.qld.gov.au/digitalprojectsdashboard + +Some style is sitting in Squiz Matrix https://www.qld.gov.au/__data/assets/css_file/0015/102129/ictdashboard.css + +Not included in Forgov SWE documentation. + +## Tenders + + + + {() => Tenders} + + diff --git a/src/stories/franchises/digital-dashboard/templates/Tenders.html b/src/stories/franchises/digital-dashboard/templates/Tenders.html new file mode 100644 index 000000000..4fde7013d --- /dev/null +++ b/src/stories/franchises/digital-dashboard/templates/Tenders.html @@ -0,0 +1,94 @@ + + +
+ +
From 4936a9e8914efdcdeeaa1dab0a706f8683ba81a1 Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Wed, 8 Feb 2023 12:49:17 +1000 Subject: [PATCH 3/4] [QOLDEV-268] add storybook page for Digital Dashboard --- .../digital-dashboard/Dashboard.stories.mdx | 9 + .../templates/Dashboard.html | 1138 +++++++++++++++++ 2 files changed, 1147 insertions(+) create mode 100644 src/stories/franchises/digital-dashboard/templates/Dashboard.html diff --git a/src/stories/franchises/digital-dashboard/Dashboard.stories.mdx b/src/stories/franchises/digital-dashboard/Dashboard.stories.mdx index 8284e13a2..17642caee 100644 --- a/src/stories/franchises/digital-dashboard/Dashboard.stories.mdx +++ b/src/stories/franchises/digital-dashboard/Dashboard.stories.mdx @@ -1,5 +1,6 @@ import { Canvas, Meta, Story } from "@storybook/addon-docs"; +import Dashboard from "./templates/Dashboard.html"; import Tenders from "./templates/Tenders.html"; import { QgPrimaryContent, QgContent } from "../../decorators"; @@ -16,6 +17,14 @@ Some style is sitting in Squiz Matrix https://www.qld.gov.au/__data/assets/css_f Not included in Forgov SWE documentation. +## Dashboard + + + + {() => Dashboard} + + + ## Tenders diff --git a/src/stories/franchises/digital-dashboard/templates/Dashboard.html b/src/stories/franchises/digital-dashboard/templates/Dashboard.html new file mode 100644 index 000000000..3e44efd74 --- /dev/null +++ b/src/stories/franchises/digital-dashboard/templates/Dashboard.html @@ -0,0 +1,1138 @@ + +
+
+

Overview

+
+

You can see at a glance, all major government digital projects currently underway to improve service delivery to Queenslanders. The dashboard lists projects from all departments and shows the details of each project, enabling you to track and monitor their progress over time.

+
+
+

Status of projects (115)

+ + +
+
+

Expenditure of projects

+ +
    +
  • + $1052.3M +
    • +
  • + $1546.2M +
    • +
+ +
    +
  • + Cost to date +
    • +
  • + Approved expenditure +
    • +
+
+
+
+
+
+ + +
+ +
+
+
+
+

Projects by department

+

+ View all projects +

+
+
+
+
+ + Created with Highcharts 6.2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + + + + + + 1 + + + 1 + + + 4 + + + 1 + + + 1 + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 60 + + + 12 + + + 6 + + + 6 + + + 2 + + + 3 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 10 + 20 + 30 + 40 + 50 + 60 + 70 + 80 + + +
+ + + QH + (70) + + + DTMR + (12) + + + DCHDE + (7) + + + DEPW + (7) + + + DE + (6) + + + DAF + (4) + + + DESBT + (2) + + + DJAG + (2) + + + Cross-Gov + (1) + + + DCYJMA + (1) + + + DES + (1) + + + QPS + (1) + + + QT + (1) + + + DPC + + + + + DR + + + + + DRDMW + + + + + DSDILGP + + + + + DSDSATSIP + + + + + DTIS + + + + + QAO + + + + + QCS + + +
+
+ Projects by department +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + Nil projects + Nil projects + Nil projects + Nil projects + Nil projects + Nil projects + Nil projects + Nil projects +
+
+
+
+
+
+
+ + Created with Highcharts 6.2.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $523.3M / $758.6M + + + + + $309.3M / $483.9M + + + + + $12.1M / $30.8M + + + + + $10.4M / $20M + + + + + $31.1M / $50.3M + + + + + $8.9M / $9.9M + + + + + $4.3M / $15.2M + + + + + $43.3M / $46.1M + + + + + $24.3M / $32.2M + + + + + $34.4M / $34.4M + + + + + $29.8M / $41.8M + + + + + + + + + $21.2M / $23M + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 100M + 200M + 300M + 400M + 500M + 600M + 700M + 800M + + +
+ Expenditure by department +
+
+
+
+
+
From 951a6a881d1b2ab78de996f02d7017ec3d74861e Mon Sep 17 00:00:00 2001 From: ThrawnCA Date: Wed, 8 Feb 2023 13:54:44 +1000 Subject: [PATCH 4/4] [QOLDEV-267] add tabbed navigation sample to Digital Dashboard story docs --- .../digital-dashboard/templates/Dashboard.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/stories/franchises/digital-dashboard/templates/Dashboard.html b/src/stories/franchises/digital-dashboard/templates/Dashboard.html index 3e44efd74..e1534ddd3 100644 --- a/src/stories/franchises/digital-dashboard/templates/Dashboard.html +++ b/src/stories/franchises/digital-dashboard/templates/Dashboard.html @@ -1,4 +1,15 @@ + +
+
+ +
+
+

Overview