From 9026f693d44b4a6f8831efff6bb1a782c754eb8a Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Tue, 1 Jun 2021 12:06:30 -0300 Subject: [PATCH 01/12] feat: begin share resources form --- src/_includes/layouts/share.njk | 46 +++++++++++ src/assets/styles/abstracts/_variables.scss | 2 +- src/assets/styles/app.scss | 7 +- src/assets/styles/components/_button.scss | 8 +- src/assets/styles/components/_input.scss | 80 +++++++++++++++++++ .../styles/components/_radio-group.scss | 2 +- src/assets/styles/layout/_form.scss | 41 ++++++++++ src/assets/styles/pages/_share.scss | 28 +++++++ src/share-learning-resources.md | 10 +++ 9 files changed, 217 insertions(+), 7 deletions(-) create mode 100644 src/_includes/layouts/share.njk create mode 100644 src/assets/styles/components/_input.scss create mode 100644 src/assets/styles/layout/_form.scss create mode 100644 src/assets/styles/pages/_share.scss create mode 100644 src/share-learning-resources.md diff --git a/src/_includes/layouts/share.njk b/src/_includes/layouts/share.njk new file mode 100644 index 00000000..4290bc1a --- /dev/null +++ b/src/_includes/layouts/share.njk @@ -0,0 +1,46 @@ +{% extends "layouts/base.njk" %} + +{% set bodyClass = "page page--share" %} + +{% block content %} +
+ {{ content | safe }} +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ What type of resource are you sharing? + {% for item in ['Lesson plans', 'Unplugged coding activities', 'Robot-based coding activities', 'Educational coding materials', 'Other'] %} +
+ + +
+ {% endfor %} +
+
+ + +
Please provide a brief description of the resource.
+
+
+ + +
+ +
+
+{% endblock %} diff --git a/src/assets/styles/abstracts/_variables.scss b/src/assets/styles/abstracts/_variables.scss index 51ffd03f..b14155cb 100644 --- a/src/assets/styles/abstracts/_variables.scss +++ b/src/assets/styles/abstracts/_variables.scss @@ -37,7 +37,7 @@ $colors: ( green-65: #8bc3ab, green-55: #66b2a9, green-45: #4c9990, - green-35: hsl(173, 34, 35), + green-35: hsl(173, 34%, 35%), green-25: #30444e, green-15: #22343c, green-05: #18252c, diff --git a/src/assets/styles/app.scss b/src/assets/styles/app.scss index ff378b32..49b000c7 100644 --- a/src/assets/styles/app.scss +++ b/src/assets/styles/app.scss @@ -23,7 +23,8 @@ 'layout/header', 'layout/article', 'layout/sidebar', - 'layout/footer'; + 'layout/footer', + 'layout/form'; // 5. Components @import @@ -36,6 +37,7 @@ 'components/filters', 'components/grid-image', 'components/grid-video', + 'components/input', 'components/label', 'components/overlay', 'components/navigation', @@ -51,7 +53,8 @@ 'pages/activities', 'pages/guides', 'pages/projects', - 'pages/resources'; + 'pages/resources', + 'pages/share'; // 7. Themes @import diff --git a/src/assets/styles/components/_button.scss b/src/assets/styles/components/_button.scss index 2e5ef543..8891350c 100644 --- a/src/assets/styles/components/_button.scss +++ b/src/assets/styles/components/_button.scss @@ -6,7 +6,7 @@ align-items: center; appearance: none; background-color: var(--color-green-45); - border: 0; + border: solid var(--border-thin) var(--fl-fgColor, transparent); border-radius: var(--radius-lg); box-shadow: 0 1rem 0 0 var(--fl-linkColor, var(--fl-fgColor, var(--color-green-35))); color: var(--color-white); @@ -33,11 +33,13 @@ } &:focus { - box-shadow: 0 0 0 calc(2 / 16 * 1rem) var(--fl-linkColor, var(--fl-fgColor, var(--color-green-25))) inset, 0 1rem 0 0 var(--fl-linkColor, var(--fl-fgColor, var(--color-green-25))); + border-color: var(--fl-linkColor, var(--fl-fgColor, var(--color-green-25))); + box-shadow: 0 1rem 0 0 var(--fl-linkColor, var(--fl-fgColor, var(--color-green-25))); outline: none; } &:active { + border-color: var(--fl-linkColor, var(--fl-fgColor, var(--color-green-25))); box-shadow: 0 calc(12 / 16 * 1rem) 0 0 var(--fl-linkColor, var(--fl-fgColor, var(--color-green-25))); margin-block: calc(36 / 16 * 1rem) calc(12 / 16 * 1rem); } @@ -56,7 +58,7 @@ } &:focus { - box-shadow: 0 0 0 calc(2 / 16 * 1rem) var(--fl-linkColor, var(--fl-fgColor, var(--color-green-25))) inset, 0 calc(12 / 16 * 1rem) 0 0 var(--fl-linkColor, var(--fl-fgColor, var(--color-green-25))); + box-shadow: 0 calc(12 / 16 * 1rem) 0 0 var(--fl-linkColor, var(--fl-fgColor, var(--color-green-25))); outline: none; } diff --git a/src/assets/styles/components/_input.scss b/src/assets/styles/components/_input.scss new file mode 100644 index 00000000..262f07c2 --- /dev/null +++ b/src/assets/styles/components/_input.scss @@ -0,0 +1,80 @@ + +input[type="text"], +input[type="email"], +textarea { + background-color: var(--color-white); + border: solid var(--border-thin) var(--fl-fgColor, var(--color-green-95)); + border-radius: var(--radius-md); + box-shadow: inset 0 4px 4px rgba(0, 0, 0, 0.25); + padding: var(--space-sm); + width: 100%; + + &:focus { + box-shadow: inset 0 0 0 calc(2 / 16 * 1rem) var(--fl-linkColor, var(--fl-fgColor, var(--color-green-35))), inset 0 4px 4px rgba(0, 0, 0, 0.25); + outline: none; + } +} + +/* purgecss start ignore */ + +[class*=fl-theme]:not(.fl-theme-prefsEditor-default) { + input[type="text"]:focus, + input[type="email"]:focus, + textarea:focus { + border-bottom-color: var(--fl-linkColor, var(--fl-fgColor, transparent)) !important; + border-left-color: var(--fl-linkColor, var(--fl-fgColor, transparent)) !important; + border-right-color: var(--fl-linkColor, var(--fl-fgColor, transparent)) !important; + border-top-color: var(--fl-linkColor, var(--fl-fgColor, transparent)) !important; + } +} + +/* purgecss end ignore */ + +input[type="text"], +input[type="email"] { + height: calc(87 / 16 * 1rem); +} + +textarea { + height: calc(142 / 16 * 1rem); + resize: vertical; +} + +input[type="checkbox"] { + clip: rect(0 0 0 0); + clip-path: inset(50%); + height: 1px; + overflow: hidden; + position: absolute; + white-space: nowrap; + width: 1px; +} + +input[type="checkbox"] + label::before { + align-items: center; + background-color: var(--fl-bgColor, var(--color-white)); + border: solid var(--border-hairline) var(--fl-fgColor, var(--color-green-45)); + border-radius: var(--radius-xs); + content: "\00a0"; + display: inline-flex; + height: calc(26 / 16 * 1rem); + justify-content: center; + margin-inline-end: var(--space-sm); + width: calc(26 / 16 * 1rem); +} + +input[type="checkbox"]:focus + label::before { + border-color: var(--fl-linkColor, var(--color-green-35)); + box-shadow: inset 0 0 0 calc(2 / 16 * 1rem) var(--fl-linkColor, var(--fl-fgColor, var(--color-green-35))); + color: var(--fl-linkColor, var(--fl-fgColor, currentColor)); +} + +input[type="checkbox"]:active + label::before { + background-color: var(--fl-linkColor, var(--fl-fgColor, var(--color-green-35))); + color: var(--fl-bgColor, var(--color-white)); + content: "\2713"; +} + +input[type="checkbox"]:checked + label::before { + content: "\2713"; +} diff --git a/src/assets/styles/components/_radio-group.scss b/src/assets/styles/components/_radio-group.scss index cc446e24..bdfb299c 100644 --- a/src/assets/styles/components/_radio-group.scss +++ b/src/assets/styles/components/_radio-group.scss @@ -3,7 +3,7 @@ // ----------------------------------------------------------------------------- .radio-group > * + * { - margin-left: 0.5rem; + margin-inline-start: 0.5rem; } .radio-group .button[aria-checked="true"] { diff --git a/src/assets/styles/layout/_form.scss b/src/assets/styles/layout/_form.scss new file mode 100644 index 00000000..993c4d89 --- /dev/null +++ b/src/assets/styles/layout/_form.scss @@ -0,0 +1,41 @@ +form { + border-top: solid var(--border-hairline) var(--color-black-05); + padding-block-start: var(--space-lg); + + > * + * { + margin-block-start: var(--space-lg); + } + + > div { + display: flex; + flex-direction: column; + } + + > div label, + legend { + font-size: var(--step-1); + font-weight: 500; + } + + > div label + input, + > div label + textarea { + margin-block-start: var(--space-sm); + } + + .hint { + margin-block-start: var(--space-sm); + } + + fieldset { + border: 0; + padding: 0; + + legend { + margin-block-end: var(--space-sm); + } + + div + div { + margin-block-start: var(--space-md); + } + } +} diff --git a/src/assets/styles/pages/_share.scss b/src/assets/styles/pages/_share.scss new file mode 100644 index 00000000..7e5a2b01 --- /dev/null +++ b/src/assets/styles/pages/_share.scss @@ -0,0 +1,28 @@ +.page--share { + @media (min-width: 960px) { + .header { + background-color: var(--color-white); + + .wrapper { + background-color: var(--color-green-95); + border-top-left-radius: var(--radius-md); + border-top-right-radius: var(--radius-md); + margin: var(--space-xl) auto 0; + } + } + + .content { + .wrapper { + background-color: var(--color-green-95); + border-bottom-left-radius: var(--radius-md); + border-bottom-right-radius: var(--radius-md); + margin-block-end: var(--space-xl); + padding-block-start: 0; + } + + form { + margin-block-start: var(--space-lg); + } + } + } +} diff --git a/src/share-learning-resources.md b/src/share-learning-resources.md new file mode 100644 index 00000000..e7ee85d1 --- /dev/null +++ b/src/share-learning-resources.md @@ -0,0 +1,10 @@ +--- +title: Share Learning Resources +layout: layouts/share.njk +permalink: /learn/share/ +--- +Based on the information you provide here, we can: + +* Attribute this resource to the right person/group. +* Include this resource in the right section of the website. +* Contact you to review the final resource before publishing it on the website. From 6473842652d5e7c986544f09d39d32012dbb9290 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 2 Jun 2021 06:57:53 -0300 Subject: [PATCH 02/12] chore: add Prettier configuration --- .prettierrc.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .prettierrc.json diff --git a/.prettierrc.json b/.prettierrc.json new file mode 100644 index 00000000..0a02bcef --- /dev/null +++ b/.prettierrc.json @@ -0,0 +1,3 @@ +{ + "tabWidth": 4 +} From 54d429d5f042d7247eb7130db4d6b7c784a90d07 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 2 Jun 2021 08:29:13 -0300 Subject: [PATCH 03/12] fix: adjust card links --- src/_includes/layouts/about.njk | 2 +- src/_includes/layouts/home.njk | 2 +- src/_includes/layouts/learn.njk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/_includes/layouts/about.njk b/src/_includes/layouts/about.njk index 0c131b5a..2aab7af3 100644 --- a/src/_includes/layouts/about.njk +++ b/src/_includes/layouts/about.njk @@ -24,7 +24,7 @@ {% for card in whatWeDoSection.cards %}
-

{{ card.title }}

+

{{ card.title }}

{% endfor %} diff --git a/src/_includes/layouts/home.njk b/src/_includes/layouts/home.njk index b2e1215a..0a935fd3 100644 --- a/src/_includes/layouts/home.njk +++ b/src/_includes/layouts/home.njk @@ -22,7 +22,7 @@ {% endif %}
-

{{ card.title }}

+

{{ card.title }}

{% endfor %} diff --git a/src/_includes/layouts/learn.njk b/src/_includes/layouts/learn.njk index 6f431e63..dcfbc2c2 100644 --- a/src/_includes/layouts/learn.njk +++ b/src/_includes/layouts/learn.njk @@ -27,7 +27,7 @@ {% image card.image, "", 666, 480 %}
-

{{ card.title }}

+

{{ card.title }}

{{ card.content | markdown | safe }}
@@ -45,7 +45,7 @@

{{ robotActivitiesSection.callToActionText }}

- {{ robotActivitiesSection.imageAlt }} + {{ robotActivitiesSection.imageAlt }}
From 17fc32eb0ecbb2be5c24ed608feb9c5d6bb51778 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 2 Jun 2021 08:29:45 -0300 Subject: [PATCH 04/12] feat: drop shadow for share container --- .prettierrc.json | 1 + src/assets/styles/pages/_share.scss | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/.prettierrc.json b/.prettierrc.json index 0a02bcef..f41a05d7 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,3 +1,4 @@ { + "printWidth": 120, "tabWidth": 4 } diff --git a/src/assets/styles/pages/_share.scss b/src/assets/styles/pages/_share.scss index 7e5a2b01..079502b4 100644 --- a/src/assets/styles/pages/_share.scss +++ b/src/assets/styles/pages/_share.scss @@ -1,5 +1,13 @@ .page--share { + main { + background-color: var(--color-green-95); + } + @media (min-width: 960px) { + main { + background-color: var(--color-white); + } + .header { background-color: var(--color-white); @@ -7,6 +15,7 @@ background-color: var(--color-green-95); border-top-left-radius: var(--radius-md); border-top-right-radius: var(--radius-md); + box-shadow: 0 var(--space-xs) var(--space-xs) rgba(0, 0, 0, 0.25); margin: var(--space-xl) auto 0; } } @@ -16,6 +25,7 @@ background-color: var(--color-green-95); border-bottom-left-radius: var(--radius-md); border-bottom-right-radius: var(--radius-md); + box-shadow: 0 var(--space-xs) var(--space-xs) rgba(0, 0, 0, 0.25); margin-block-end: var(--space-xl); padding-block-start: 0; } From fe9b4dbfd8028f2b17a4541b460f645af9907581 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 2 Jun 2021 08:39:35 -0300 Subject: [PATCH 05/12] feat: catch submissions --- src/_includes/layouts/share.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_includes/layouts/share.njk b/src/_includes/layouts/share.njk index 4290bc1a..03f863b7 100644 --- a/src/_includes/layouts/share.njk +++ b/src/_includes/layouts/share.njk @@ -5,7 +5,7 @@ {% block content %}
{{ content | safe }} -
+
From e8572fea757758f6e6fa885ef3272ceb0685fb60 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 2 Jun 2021 09:23:21 -0300 Subject: [PATCH 06/12] feat: link from learn page --- .prettierrc.json | 10 +++++++++- src/_includes/layouts/share.njk | 23 +++++++++++++---------- src/_includes/svg/upload.svg | 1 + src/assets/styles/base/_base.scss | 16 ++++++++++++++++ src/assets/styles/layout/_form.scss | 21 ++++++++++++++++++++- src/learn.md | 2 +- 6 files changed, 60 insertions(+), 13 deletions(-) create mode 100644 src/_includes/svg/upload.svg diff --git a/.prettierrc.json b/.prettierrc.json index f41a05d7..a97f0a5c 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,4 +1,12 @@ { "printWidth": 120, - "tabWidth": 4 + "tabWidth": 4, + "overrides": [ + { + "files": ["*.md"], + "options": { + "tabWidth": 2 + } + } + ] } diff --git a/src/_includes/layouts/share.njk b/src/_includes/layouts/share.njk index 03f863b7..1d4d2dc2 100644 --- a/src/_includes/layouts/share.njk +++ b/src/_includes/layouts/share.njk @@ -5,21 +5,24 @@ {% block content %}
{{ content | safe }} - -
- + + +
+
-
- +
+
-
- +
+
-
- +
+
@@ -38,7 +41,7 @@
- +
diff --git a/src/_includes/svg/upload.svg b/src/_includes/svg/upload.svg new file mode 100644 index 00000000..ac2726f8 --- /dev/null +++ b/src/_includes/svg/upload.svg @@ -0,0 +1 @@ + diff --git a/src/assets/styles/base/_base.scss b/src/assets/styles/base/_base.scss index d57daa29..eb095920 100644 --- a/src/assets/styles/base/_base.scss +++ b/src/assets/styles/base/_base.scss @@ -34,3 +34,19 @@ a:not([class]) { color: currentColor; } } + +.bg--red-75 a:not([class]) { + &:hover { + color: var(--color-black-25); + } + + &:focus { + box-shadow: 0 0 0 var(--space-xxs) var(--color-red-35); + } + + &:active, + &:hover:active { + background-color: var(--color-red-35); + color: var(--color-white); + } +} diff --git a/src/assets/styles/layout/_form.scss b/src/assets/styles/layout/_form.scss index 993c4d89..00ba80ed 100644 --- a/src/assets/styles/layout/_form.scss +++ b/src/assets/styles/layout/_form.scss @@ -1,6 +1,9 @@ form { border-top: solid var(--border-hairline) var(--color-black-05); - padding-block-start: var(--space-lg); + display: flex; + flex-direction: row; + flex-wrap: wrap; + justify-content: space-between; > * + * { margin-block-start: var(--space-lg); @@ -9,6 +12,17 @@ form { > div { display: flex; flex-direction: column; + width: 100%; + + @media (min-width: 960px) { + &.half { + width: calc(50% - var(--space-md)); + } + } + + &.hidden { + display: none; + } } > div label, @@ -29,6 +43,7 @@ form { fieldset { border: 0; padding: 0; + width: 100%; legend { margin-block-end: var(--space-sm); @@ -38,4 +53,8 @@ form { margin-block-start: var(--space-md); } } + + [type="submit"] { + margin-inline: auto; + } } diff --git a/src/learn.md b/src/learn.md index 7739aec7..2ca663a3 100644 --- a/src/learn.md +++ b/src/learn.md @@ -11,7 +11,7 @@ resourcesSection: callToActionLink: /learn/resources/ shareSection: title: Share Learning Resources - titleLink: mailto:sshahi@ocadu.ca?subject=Share%20Learning%20Resources + titleLink: /learn/share/ content: Support other learners by sharing your ideas, handouts and activities. layout: layouts/learn permalink: /learn/ From 9f8eceb7dd6ee022acc418f149f69b76b4f22a36 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 2 Jun 2021 10:01:18 -0300 Subject: [PATCH 07/12] feat: adjust link and label styles --- src/_includes/svg/upload.svg | 2 +- src/assets/styles/base/_base.scss | 4 ++++ src/assets/styles/components/_label.scss | 5 +++++ src/assets/styles/layout/_form.scss | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/_includes/svg/upload.svg b/src/_includes/svg/upload.svg index ac2726f8..4a81cdf2 100644 --- a/src/_includes/svg/upload.svg +++ b/src/_includes/svg/upload.svg @@ -1 +1 @@ - + diff --git a/src/assets/styles/base/_base.scss b/src/assets/styles/base/_base.scss index eb095920..6421c4f0 100644 --- a/src/assets/styles/base/_base.scss +++ b/src/assets/styles/base/_base.scss @@ -32,6 +32,10 @@ a:not([class]) { &:visited { color: currentColor; + + &:active { + color: var(--color-white); + } } } diff --git a/src/assets/styles/components/_label.scss b/src/assets/styles/components/_label.scss index 4eef72f8..7b66e724 100644 --- a/src/assets/styles/components/_label.scss +++ b/src/assets/styles/components/_label.scss @@ -9,3 +9,8 @@ .label > * { font-weight: normal; } + +label svg { + height: 1em; + width: auto; +} diff --git a/src/assets/styles/layout/_form.scss b/src/assets/styles/layout/_form.scss index 00ba80ed..4e39e758 100644 --- a/src/assets/styles/layout/_form.scss +++ b/src/assets/styles/layout/_form.scss @@ -55,6 +55,6 @@ form { } [type="submit"] { - margin-inline: auto; + margin: var(--space-xl) auto 0; } } From 40bd41319f858077e1cafecbdd17040d3e938e0a Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Wed, 2 Jun 2021 10:38:25 -0300 Subject: [PATCH 08/12] feat: accept multiple files --- src/_includes/layouts/share.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/_includes/layouts/share.njk b/src/_includes/layouts/share.njk index 1d4d2dc2..b403a276 100644 --- a/src/_includes/layouts/share.njk +++ b/src/_includes/layouts/share.njk @@ -41,7 +41,7 @@
- +
From 7772b8ac294cf1b846fff86c2d322f0f092946f7 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Thu, 10 Jun 2021 08:30:56 -0300 Subject: [PATCH 09/12] fix: adjust form style --- src/assets/styles/layout/_form.scss | 1 - src/assets/styles/pages/_share.scss | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/assets/styles/layout/_form.scss b/src/assets/styles/layout/_form.scss index 4e39e758..26c861c5 100644 --- a/src/assets/styles/layout/_form.scss +++ b/src/assets/styles/layout/_form.scss @@ -1,5 +1,4 @@ form { - border-top: solid var(--border-hairline) var(--color-black-05); display: flex; flex-direction: row; flex-wrap: wrap; diff --git a/src/assets/styles/pages/_share.scss b/src/assets/styles/pages/_share.scss index 079502b4..3fe7d1c2 100644 --- a/src/assets/styles/pages/_share.scss +++ b/src/assets/styles/pages/_share.scss @@ -3,6 +3,10 @@ background-color: var(--color-green-95); } + form { + border-top: solid var(--border-hairline) var(--color-black-05); + } + @media (min-width: 960px) { main { background-color: var(--color-white); From 30c9265d39f508e4a6142d379019064af9b2643a Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Thu, 10 Jun 2021 08:35:16 -0300 Subject: [PATCH 10/12] chore: update fluid-lint-all, fix linting errors --- package-lock.json | 495 ++++--------------- package.json | 2 +- src/assets/styles/abstracts/_functions.scss | 4 +- src/assets/styles/abstracts/_tokens.scss | 510 -------------------- src/assets/styles/app.scss | 1 - 5 files changed, 103 insertions(+), 909 deletions(-) delete mode 100644 src/assets/styles/abstracts/_tokens.scss diff --git a/package-lock.json b/package-lock.json index 2c15e1ed..699efd4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2767,9 +2767,9 @@ } }, "@textlint/ast-node-types": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.4.2.tgz", - "integrity": "sha512-m5brKbI7UY/Q8sbIZ7z1KB8ls04nRILshz5fPQ4EZ04jL19qrrUHJR8A6nK3vJ/GelkDWl4I0VDYSAjLEFQV8g==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/@textlint/ast-node-types/-/ast-node-types-4.4.3.tgz", + "integrity": "sha512-qi2jjgO6Tn3KNPGnm6B7p6QTEPvY95NFsIAaJuwbulur8iJUEenp1OnoUfiDaC/g2WPPEFkcfXpmnu8XEMFo2A==", "dev": true }, "@textlint/markdown-to-ast": { @@ -7588,9 +7588,9 @@ } }, "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -7738,9 +7738,9 @@ } }, "eslint-visitor-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", - "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", "dev": true }, "espree": { @@ -8383,9 +8383,9 @@ } }, "fluid-lint-all": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fluid-lint-all/-/fluid-lint-all-1.1.1.tgz", - "integrity": "sha512-2KDQSYuGN5inOtbrsHNZS+46twagQHRXATrmbaTC+n7OkZkORrcSW4c1Le0jS1Yo5DItU/2D1suaAYy7A7qpgg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/fluid-lint-all/-/fluid-lint-all-1.1.4.tgz", + "integrity": "sha512-HeNs30uQnCLyd+dISeDq/fQdFeRqLKGUc5ZUDq8Rjp5wwYNVLmCjHcy3jkqzlbYQoZJnWHO3kkEAk3rRzCw51w==", "dev": true, "requires": { "@textlint/markdown-to-ast": "6.2.6", @@ -8402,8 +8402,8 @@ "markdownlint-config-fluid": "0.1.3", "minimatch": "3.0.4", "minimist": "1.2.5", - "stylelint": "13.9.0", - "stylelint-config-fluid": "0.1.0" + "stylelint": "13.13.1", + "stylelint-config-fluid": "0.2.1" }, "dependencies": { "infusion": { @@ -10793,9 +10793,9 @@ "dev": true }, "known-css-properties": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.20.0.tgz", - "integrity": "sha512-URvsjaA9ypfreqJ2/ylDr5MUERhJZ+DhguoWRr2xgS5C7aGCalXo+ewL+GixgKBfhT2vuL02nbIgNGqVWgTOYw==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz", + "integrity": "sha512-sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==", "dev": true }, "kuler": { @@ -11262,12 +11262,6 @@ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", "dev": true }, - "lodash.flatten": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", - "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", - "dev": true - }, "lodash.isfinite": { "version": "3.3.2", "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz", @@ -11317,9 +11311,9 @@ } }, "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -17764,36 +17758,36 @@ } }, "stylelint": { - "version": "13.9.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.9.0.tgz", - "integrity": "sha512-VVWH2oixOAxpWL1vH+V42ReCzBjW2AeqskSAbi8+3OjV1Xg3VZkmTcAqBZfRRvJeF4BvYuDLXebW3tIHxgZDEg==", + "version": "13.13.1", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz", + "integrity": "sha512-Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==", "dev": true, "requires": { "@stylelint/postcss-css-in-js": "^0.37.2", "@stylelint/postcss-markdown": "^0.36.2", "autoprefixer": "^9.8.6", - "balanced-match": "^1.0.0", - "chalk": "^4.1.0", + "balanced-match": "^2.0.0", + "chalk": "^4.1.1", "cosmiconfig": "^7.0.0", "debug": "^4.3.1", "execall": "^2.0.0", "fast-glob": "^3.2.5", "fastest-levenshtein": "^1.0.12", - "file-entry-cache": "^6.0.0", + "file-entry-cache": "^6.0.1", "get-stdin": "^8.0.0", "global-modules": "^2.0.0", - "globby": "^11.0.2", + "globby": "^11.0.3", "globjoin": "^0.1.4", "html-tags": "^3.1.0", "ignore": "^5.1.8", "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", - "known-css-properties": "^0.20.0", - "lodash": "^4.17.20", - "log-symbols": "^4.0.0", + "known-css-properties": "^0.21.0", + "lodash": "^4.17.21", + "log-symbols": "^4.1.0", "mathml-tag-names": "^2.1.3", "meow": "^9.0.0", - "micromatch": "^4.0.2", + "micromatch": "^4.0.4", "normalize-selector": "^0.2.0", "postcss": "^7.0.35", "postcss-html": "^0.36.0", @@ -17803,19 +17797,19 @@ "postcss-safe-parser": "^4.0.2", "postcss-sass": "^0.4.4", "postcss-scss": "^2.1.1", - "postcss-selector-parser": "^6.0.4", + "postcss-selector-parser": "^6.0.5", "postcss-syntax": "^0.36.2", "postcss-value-parser": "^4.1.0", "resolve-from": "^5.0.0", "slash": "^3.0.0", "specificity": "^0.4.1", - "string-width": "^4.2.0", + "string-width": "^4.2.2", "strip-ansi": "^6.0.0", "style-search": "^0.1.0", "sugarss": "^2.0.0", "svg-tags": "^1.0.0", - "table": "^6.0.7", - "v8-compile-cache": "^2.2.0", + "table": "^6.6.0", + "v8-compile-cache": "^2.3.0", "write-file-atomic": "^3.0.3" }, "dependencies": { @@ -17834,169 +17828,16 @@ "color-convert": "^2.0.1" } }, - "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true - }, - "postcss": { - "version": "7.0.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", - "integrity": "sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==", - "dev": true, - "requires": { - "chalk": "^2.4.2", - "source-map": "^0.6.1", - "supports-color": "^6.1.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, - "stylelint-config-fluid": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/stylelint-config-fluid/-/stylelint-config-fluid-0.1.0.tgz", - "integrity": "sha512-+mnw995z3plFKtnx12Ipxo/lReXOBMpyubx9UewJVdAQ2qMpiBXHnEV3J6wF/NQbWimtO3+J5LRa6kZCfMlibA==", - "dev": true, - "requires": { - "stylelint": "13.7.2", - "stylelint-config-standard": "20.0.0", - "stylelint-config-standard-scss": "1.1.0", - "stylelint-order": "4.1.0", - "stylelint-scss": "3.18.0" - }, - "dependencies": { - "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "balanced-match": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", + "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", "dev": true }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, "chalk": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", - "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz", + "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==", "dev": true, "requires": { "ansi-styles": "^4.1.0", @@ -18018,63 +17859,28 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, - "file-entry-cache": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", - "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", - "dev": true, - "requires": { - "flat-cache": "^2.0.1" - } - }, - "flat-cache": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", - "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", - "dev": true, - "requires": { - "flatted": "^2.0.0", - "rimraf": "2.6.3", - "write": "1.0.3" - } - }, - "flatted": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", - "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", - "dev": true - }, "ignore": { "version": "5.1.8", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", "dev": true }, - "known-css-properties": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.19.0.tgz", - "integrity": "sha512-eYboRV94Vco725nKMlpkn3nV2+96p9c3gKXRsYqAJSswSENvBhN7n5L+uDhY58xQa0UukWsDMTGELzmD8Q+wTA==", - "dev": true - }, - "meow": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/meow/-/meow-7.1.1.tgz", - "integrity": "sha512-GWHvA5QOcS412WCo8vwKDlTelGLsCGBVevQB5Kva961rmNfun0PCbv5+xta2kUMFJyR8/oWnn7ddeKdosbAPbA==", + "micromatch": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", "dev": true, "requires": { - "@types/minimist": "^1.2.0", - "camelcase-keys": "^6.2.2", - "decamelize-keys": "^1.1.0", - "hard-rejection": "^2.1.0", - "minimist-options": "4.1.0", - "normalize-package-data": "^2.5.0", - "read-pkg-up": "^7.0.1", - "redent": "^3.0.0", - "trim-newlines": "^3.0.0", - "type-fest": "^0.13.1", - "yargs-parser": "^18.1.3" + "braces": "^3.0.1", + "picomatch": "^2.2.3" } }, + "picomatch": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", + "integrity": "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==", + "dev": true + }, "postcss": { "version": "7.0.35", "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.35.tgz", @@ -18149,15 +17955,6 @@ } } }, - "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, "slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -18173,62 +17970,6 @@ "ansi-regex": "^5.0.0" } }, - "stylelint": { - "version": "13.7.2", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.7.2.tgz", - "integrity": "sha512-mmieorkfmO+ZA6CNDu1ic9qpt4tFvH2QUB7vqXgrMVHe5ENU69q7YDq0YUg/UHLuCsZOWhUAvcMcLzLDIERzSg==", - "dev": true, - "requires": { - "@stylelint/postcss-css-in-js": "^0.37.2", - "@stylelint/postcss-markdown": "^0.36.1", - "autoprefixer": "^9.8.6", - "balanced-match": "^1.0.0", - "chalk": "^4.1.0", - "cosmiconfig": "^7.0.0", - "debug": "^4.1.1", - "execall": "^2.0.0", - "fast-glob": "^3.2.4", - "fastest-levenshtein": "^1.0.12", - "file-entry-cache": "^5.0.1", - "get-stdin": "^8.0.0", - "global-modules": "^2.0.0", - "globby": "^11.0.1", - "globjoin": "^0.1.4", - "html-tags": "^3.1.0", - "ignore": "^5.1.8", - "import-lazy": "^4.0.0", - "imurmurhash": "^0.1.4", - "known-css-properties": "^0.19.0", - "lodash": "^4.17.20", - "log-symbols": "^4.0.0", - "mathml-tag-names": "^2.1.3", - "meow": "^7.1.1", - "micromatch": "^4.0.2", - "normalize-selector": "^0.2.0", - "postcss": "^7.0.32", - "postcss-html": "^0.36.0", - "postcss-less": "^3.1.4", - "postcss-media-query-parser": "^0.2.3", - "postcss-resolve-nested-selector": "^0.1.1", - "postcss-safe-parser": "^4.0.2", - "postcss-sass": "^0.4.4", - "postcss-scss": "^2.1.1", - "postcss-selector-parser": "^6.0.2", - "postcss-syntax": "^0.36.2", - "postcss-value-parser": "^4.1.0", - "resolve-from": "^5.0.0", - "slash": "^3.0.0", - "specificity": "^0.4.1", - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "style-search": "^0.1.0", - "sugarss": "^2.0.0", - "svg-tags": "^1.0.0", - "table": "^6.0.1", - "v8-compile-cache": "^2.1.1", - "write-file-atomic": "^3.0.3" - } - }, "supports-color": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", @@ -18237,64 +17978,34 @@ "requires": { "has-flag": "^4.0.0" } - }, - "type-fest": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", - "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", - "dev": true - }, - "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } } } }, - "stylelint-config-recommended": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-3.0.0.tgz", - "integrity": "sha512-F6yTRuc06xr1h5Qw/ykb2LuFynJ2IxkKfCMf+1xqPffkxh0S09Zc902XCffcsw/XMFq/OzQ1w54fLIDtmRNHnQ==", - "dev": true - }, - "stylelint-config-standard": { - "version": "20.0.0", - "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-20.0.0.tgz", - "integrity": "sha512-IB2iFdzOTA/zS4jSVav6z+wGtin08qfj+YyExHB3LF9lnouQht//YyB0KZq9gGz5HNPkddHOzcY8HsUey6ZUlA==", + "stylelint-config-fluid": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/stylelint-config-fluid/-/stylelint-config-fluid-0.2.1.tgz", + "integrity": "sha512-vz3k3pRl2Ri3k7sjPoc23iX6slWb+q+7F3MOIqFgaf7ODfEruVqynuyzhgMUQvOIEVNuzitQra1vIrd0bOsvIQ==", "dev": true, "requires": { - "stylelint-config-recommended": "^3.0.0" + "stylelint": "13.13.1", + "stylelint-config-standard": "22.0.0", + "stylelint-order": "4.1.0", + "stylelint-scss": "3.19.0" } }, - "stylelint-config-standard-scss": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-1.1.0.tgz", - "integrity": "sha512-03kuXO1fyeydfyJ/GDngpW2iJFZ20ZsOR1oEbBq+OTLrWZ8063yME5fnPkSkMyEhQ6NVJBG4+/5E0v+AiSFdJQ==", + "stylelint-config-recommended": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-5.0.0.tgz", + "integrity": "sha512-c8aubuARSu5A3vEHLBeOSJt1udOdS+1iue7BmJDTSXoCBmfEQmmWX+59vYIj3NQdJBY6a/QRv1ozVFpaB9jaqA==", + "dev": true + }, + "stylelint-config-standard": { + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-22.0.0.tgz", + "integrity": "sha512-uQVNi87SHjqTm8+4NIP5NMAyY/arXrBgimaaT7skvRfE9u3JKXRK9KBkbr4pVmeciuCcs64kAdjlxfq6Rur7Hw==", "dev": true, "requires": { - "stylelint-config-standard": "~18.3.0" - }, - "dependencies": { - "stylelint-config-recommended": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-2.2.0.tgz", - "integrity": "sha512-bZ+d4RiNEfmoR74KZtCKmsABdBJr4iXRiCso+6LtMJPw5rd/KnxUWTxht7TbafrTJK1YRjNgnN0iVZaJfc3xJA==", - "dev": true - }, - "stylelint-config-standard": { - "version": "18.3.0", - "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-18.3.0.tgz", - "integrity": "sha512-Tdc/TFeddjjy64LvjPau9SsfVRexmTFqUhnMBrzz07J4p2dVQtmpncRF/o8yZn8ugA3Ut43E6o1GtjX80TFytw==", - "dev": true, - "requires": { - "stylelint-config-recommended": "^2.2.0" - } - } + "stylelint-config-recommended": "^5.0.0" } }, "stylelint-order": { @@ -18337,9 +18048,9 @@ } }, "stylelint-scss": { - "version": "3.18.0", - "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.18.0.tgz", - "integrity": "sha512-LD7+hv/6/ApNGt7+nR/50ft7cezKP2HM5rI8avIdGaUWre3xlHfV4jKO/DRZhscfuN+Ewy9FMhcTq0CcS0C/SA==", + "version": "3.19.0", + "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.19.0.tgz", + "integrity": "sha512-Ic5bsmpS4wVucOw44doC1Yi9f5qbeVL4wPFiEOaUElgsOuLEN6Ofn/krKI8BeNL2gAn53Zu+IcVV4E345r6rBw==", "dev": true, "requires": { "lodash": "^4.17.15", @@ -18447,26 +18158,23 @@ "dev": true }, "table": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/table/-/table-6.3.0.tgz", - "integrity": "sha512-gM9kB7aNIuSagW89Fh+SdL49uhKnVSORxMcV72u/dfptFdqExInNn5M21wgq/Uf5UdJpsboFhNe/0SoNKjaxzg==", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", + "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", "dev": true, "requires": { "ajv": "^8.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", "lodash.clonedeep": "^4.5.0", - "lodash.flatten": "^4.4.0", "lodash.truncate": "^4.4.2", "slice-ansi": "^4.0.0", - "string-width": "^4.2.0" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0" }, "dependencies": { "ajv": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.1.0.tgz", - "integrity": "sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==", + "version": "8.6.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.0.tgz", + "integrity": "sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -18475,11 +18183,26 @@ "uri-js": "^4.2.2" } }, + "ansi-regex": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", + "dev": true + }, "json-schema-traverse": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true + }, + "strip-ansi": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.0" + } } } }, @@ -20072,26 +19795,6 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, - "write": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", - "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", - "dev": true, - "requires": { - "mkdirp": "^0.5.1" - }, - "dependencies": { - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - } - } - }, "write-file-atomic": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", diff --git a/package.json b/package.json index 3cf80b12..e8b6cb4f 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "concurrently": "6.2.0", "cross-env": "7.0.3", "debug": "4.3.1", - "fluid-lint-all": "1.1.1", + "fluid-lint-all": "1.1.4", "html-minifier": "4.0.0", "husky": "4.3.8", "image-size": "1.0.0", diff --git a/src/assets/styles/abstracts/_functions.scss b/src/assets/styles/abstracts/_functions.scss index 6e8cc4ac..00573b22 100644 --- a/src/assets/styles/abstracts/_functions.scss +++ b/src/assets/styles/abstracts/_functions.scss @@ -1,6 +1,8 @@ // ----------------------------------------------------------------------------- // This file contains all application-wide Sass functions. // ----------------------------------------------------------------------------- +@use "sass:math"; + $browser-context: 16px; @function rem($pixels, $context: $browser-context) { @@ -12,5 +14,5 @@ $browser-context: 16px; $context: $context * 1px; } - @return $pixels / $context * 1rem; + @return math.div($pixels, $context) * 1rem; } diff --git a/src/assets/styles/abstracts/_tokens.scss b/src/assets/styles/abstracts/_tokens.scss deleted file mode 100644 index 5f447f00..00000000 --- a/src/assets/styles/abstracts/_tokens.scss +++ /dev/null @@ -1,510 +0,0 @@ -$tokens: ( - palette: ( - white: ( - category: fill, - value: rgba(255, 255, 255, 1), - type: color - ), - grey-95: ( - category: fill, - value: rgba(241, 242, 244, 1), - type: color - ), - grey-85: ( - category: fill, - value: rgba(213, 216, 221, 1), - type: color - ), - grey-75: ( - category: fill, - value: rgba(185, 190, 198, 1), - type: color - ), - black-35: ( - category: fill, - value: rgba(80, 88, 98, 1), - type: color - ), - black-25: ( - category: fill, - value: rgba(58, 63, 70, 1), - type: color - ), - black-15: ( - category: fill, - value: rgba(34, 38, 42, 1), - type: color - ), - black-05: ( - category: fill, - value: rgba(30, 30, 30, 1), - type: color - ), - blue-95: ( - category: fill, - value: rgba(238, 242, 246, 1), - type: color - ), - blue-85: ( - category: fill, - value: rgba(205, 215, 228, 1), - type: color - ), - blue-75: ( - category: fill, - value: rgba(172, 188, 210, 1), - type: color - ), - blue-65: ( - category: fill, - value: rgba(139, 162, 192, 1), - type: color - ), - blue-55: ( - category: fill, - value: rgba(106, 135, 174, 1), - type: color - ), - blue-45: ( - category: fill, - value: rgba(81, 109, 149, 1), - type: color - ), - blue-35: ( - category: fill, - value: rgba(63, 85, 116, 1), - type: color - ), - blue-25: ( - category: fill, - value: rgba(45, 61, 83, 1), - type: color - ), - blue-15: ( - category: fill, - value: rgba(27, 36, 50, 1), - type: color - ), - cream-95: ( - category: fill, - value: rgba(249, 242, 236, 1), - type: color - ), - cream-85: ( - category: fill, - value: rgba(236, 216, 199, 1), - type: color - ), - cream-75: ( - category: fill, - value: rgba(223, 189, 160, 1), - type: color - ), - cream-65: ( - category: fill, - value: rgba(210, 162, 122, 1), - type: color - ), - red-85: ( - category: fill, - value: rgba(248, 193, 186, 1), - type: color - ), - red-75: ( - category: fill, - value: rgba(243, 152, 139, 1), - type: color - ), - red-65: ( - category: fill, - value: rgba(234, 115, 98, 1), - type: color - ), - red-55: ( - category: fill, - value: rgba(234, 70, 47, 1), - type: color - ), - red-45: ( - category: fill, - value: rgba(193, 57, 37, 1), - type: color - ), - green-95: ( - category: fill, - value: rgba(235, 250, 248, 1), - type: color - ), - green-85: ( - category: fill, - value: rgba(204, 230, 226, 1), - type: color - ), - green-75: ( - category: fill, - value: rgba(170, 213, 207, 1), - type: color - ), - green-65: ( - category: fill, - value: rgba(136, 195, 188, 1), - type: color - ), - green-55: ( - category: fill, - value: rgba(102, 178, 169, 1), - type: color - ), - green-45: ( - category: fill, - value: rgba(76, 153, 144, 1), - type: color - ), - green-25: ( - category: fill, - value: rgba(48, 68, 78, 1), - type: color - ), - green-15: ( - category: fill, - value: rgba(34, 52, 60, 1), - type: color - ), - green-05: ( - category: fill, - value: rgba(24, 37, 44, 1), - type: color - ), - orange-95: ( - category: fill, - value: rgba(254, 236, 230, 1), - type: color - ), - orange-85: ( - category: fill, - value: rgba(252, 198, 181, 1), - type: color - ), - orange-75: ( - category: fill, - value: rgba(250, 159, 132, 1), - type: color - ), - orange-65: ( - category: fill, - value: rgba(249, 121, 83, 1), - type: color - ), - orange-55: ( - category: fill, - value: rgba(247, 83, 34, 1), - type: color - ), - teal-85: ( - category: fill, - value: rgba(211, 231, 236, 1), - type: color - ), - teal-75: ( - category: fill, - value: rgba(164, 208, 218, 1), - type: color - ), - teal-65: ( - category: fill, - value: rgba(128, 190, 204, 1), - type: color - ), - teal-55: ( - category: fill, - value: rgba(91, 171, 189, 1), - type: color - ), - teal-45: ( - category: fill, - value: rgba(66, 146, 164, 1), - type: color - ), - teal-35: ( - category: fill, - value: rgba(51, 113, 127, 1), - type: color - ), - yellow-85: ( - category: fill, - value: rgba(249, 220, 185, 1), - type: color - ), - yellow-75: ( - category: fill, - value: rgba(245, 197, 138, 1), - type: color - ), - yellow-65: ( - category: fill, - value: rgba(241, 174, 91, 1), - type: color - ), - yellow-55: ( - category: fill, - value: rgba(237, 151, 44, 1), - type: color - ), - yellow-45: ( - category: fill, - value: rgba(211, 125, 18, 1), - type: color - ), - purple-75: ( - category: fill, - value: rgba(208, 175, 200, 1), - type: color - ), - purple-65: ( - category: fill, - value: rgba(189, 143, 178, 1), - type: color - ), - purple-55: ( - category: fill, - value: rgba(170, 111, 156, 1), - type: color - ), - purple-45: ( - category: fill, - value: rgba(144, 85, 130, 1), - type: color - ), - purple-35: ( - category: fill, - value: rgba(112, 66, 101, 1), - type: color - ) - ), - typography: ( - p: ( - category: font, - fontSize: ( - value: 18, - type: number, - unit: pixel - ), - textDecoration: ( - value: none, - type: string - ), - fontFamily: ( - value: Work Sans, - type: string - ), - fontWeight: ( - value: 400, - type: number - ), - fontStyle: ( - value: normal, - type: string - ), - fontStretch: ( - value: normal, - type: string - ), - _fontStyleOld: ( - value: Regular, - type: string - ), - letterSpacing: ( - value: 0, - type: number, - unit: pixels - ), - lineHeight: ( - value: 140, - type: number, - unit: percent - ), - paragraphIndent: ( - value: 0, - type: number, - unit: pixel - ), - paragraphSpacing: ( - value: 14, - type: number, - unit: pixel - ), - textCase: ( - value: none, - type: string - ) - ), - h1: ( - category: font, - fontSize: ( - value: 44, - type: number, - unit: pixel - ), - textDecoration: ( - value: none, - type: string - ), - fontFamily: ( - value: Libre Franklin, - type: string - ), - fontWeight: ( - value: 700, - type: number - ), - fontStyle: ( - value: normal, - type: string - ), - fontStretch: ( - value: normal, - type: string - ), - _fontStyleOld: ( - value: Bold, - type: string - ), - letterSpacing: ( - value: 0, - type: number, - unit: pixels - ), - lineHeight: ( - value: 140, - type: number, - unit: percent - ), - paragraphIndent: ( - value: 0, - type: number, - unit: pixel - ), - paragraphSpacing: ( - value: 0, - type: number, - unit: pixel - ), - textCase: ( - value: none, - type: string - ) - ), - h2: ( - category: font, - fontSize: ( - value: 40, - type: number, - unit: pixel - ), - textDecoration: ( - value: none, - type: string - ), - fontFamily: ( - value: Libre Franklin, - type: string - ), - fontWeight: ( - value: 600, - type: number - ), - fontStyle: ( - value: normal, - type: string - ), - fontStretch: ( - value: normal, - type: string - ), - _fontStyleOld: ( - value: SemiBold, - type: string - ), - letterSpacing: ( - value: 0, - type: number, - unit: pixels - ), - lineHeight: ( - value: 130, - type: number, - unit: percent - ), - paragraphIndent: ( - value: 0, - type: number, - unit: pixel - ), - paragraphSpacing: ( - value: 0, - type: number, - unit: pixel - ), - textCase: ( - value: none, - type: string - ) - ), - h3: ( - category: font, - fontSize: ( - value: 28, - type: number, - unit: pixel - ), - textDecoration: ( - value: none, - type: string - ), - fontFamily: ( - value: Libre Franklin, - type: string - ), - fontWeight: ( - value: 600, - type: number - ), - fontStyle: ( - value: normal, - type: string - ), - fontStretch: ( - value: normal, - type: string - ), - _fontStyleOld: ( - value: SemiBold, - type: string - ), - letterSpacing: ( - value: 0, - type: number, - unit: pixels - ), - lineHeight: ( - value: 140, - type: number, - unit: percent - ), - paragraphIndent: ( - value: 0, - type: number, - unit: pixel - ), - paragraphSpacing: ( - value: 0, - type: number, - unit: pixel - ), - textCase: ( - value: none, - type: string - ) - ) - ) -); diff --git a/src/assets/styles/app.scss b/src/assets/styles/app.scss index 49b000c7..dc080453 100644 --- a/src/assets/styles/app.scss +++ b/src/assets/styles/app.scss @@ -3,7 +3,6 @@ // 1. Configuration and helpers @import 'abstracts/functions', - 'abstracts/tokens', 'abstracts/variables', 'abstracts/mixins'; From 43ec24691f8bef47a261ed5dfd454dfe3a652824 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Mon, 29 Nov 2021 08:40:37 -0400 Subject: [PATCH 11/12] chore: pin NPM version to 6.x --- .nvmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 00000000..e1fcd1ea --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +lts/erbium From 941c39b3fe167edc74f16a3218e8f73f0d929ce7 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Mon, 29 Nov 2021 08:41:13 -0400 Subject: [PATCH 12/12] feat: update share page --- src/_includes/layouts/share.njk | 4 ++-- src/share-learning-resources.md | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/_includes/layouts/share.njk b/src/_includes/layouts/share.njk index b403a276..b12e3c00 100644 --- a/src/_includes/layouts/share.njk +++ b/src/_includes/layouts/share.njk @@ -22,8 +22,8 @@
- - + +
What type of resource are you sharing? diff --git a/src/share-learning-resources.md b/src/share-learning-resources.md index e7ee85d1..21fb6fa6 100644 --- a/src/share-learning-resources.md +++ b/src/share-learning-resources.md @@ -3,8 +3,14 @@ title: Share Learning Resources layout: layouts/share.njk permalink: /learn/share/ --- +Weavly provides an open-access repository where activities, lessons, videos and other resources can be collected and shared. + +You can submit your activity or educational support at any time to share with other learners and educators. + Based on the information you provide here, we can: * Attribute this resource to the right person/group. * Include this resource in the right section of the website. * Contact you to review the final resource before publishing it on the website. + +**We will only use your email address to contact you about your submission.**