From cfa97dcd116cc9b9ce986671a9cd72ac20cf4686 Mon Sep 17 00:00:00 2001 From: rmccar <42928680+rmccar@users.noreply.github.com> Date: Thu, 22 Aug 2024 14:08:40 +0100 Subject: [PATCH 1/5] Remove spacing around abbreviation text on inputs (#3313) --- src/components/input/_macro.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/input/_macro.njk b/src/components/input/_macro.njk index 9e49ee966b..d8194af919 100644 --- a/src/components/input/_macro.njk +++ b/src/components/input/_macro.njk @@ -103,7 +103,7 @@ aria-label="{{ abbr.title }}" role="figure" {% endif %} {% if abbr.title %}title="{{ abbr.title }}"{% endif %} - >{{ abbr.text }} + >{{- abbr.text -}} {{ endTag | safe }} From 86f115ed41ad7ba8e7127196f5bf98bc1b723555 Mon Sep 17 00:00:00 2001 From: rmccar <42928680+rmccar@users.noreply.github.com> Date: Fri, 23 Aug 2024 10:24:03 +0100 Subject: [PATCH 2/5] Document manual process of publishing to NPM (#3315) --- .github/workflows/npm-bundle.yml | 2 +- README.md | 36 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/.github/workflows/npm-bundle.yml b/.github/workflows/npm-bundle.yml index 6482768624..a70a3b3448 100644 --- a/.github/workflows/npm-bundle.yml +++ b/.github/workflows/npm-bundle.yml @@ -26,4 +26,4 @@ jobs: - run: yarn npm-bundle - run: npm publish --access public env: - NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}} + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/README.md b/README.md index acdf2ac56d..32adbb73f2 100644 --- a/README.md +++ b/README.md @@ -144,6 +144,42 @@ Generate a build into `./build`. yarn build ``` +## Manually publish to NPM + +Make sure you are logged into the CLI with the DS shared npm account + +Make sure dependencies are installed: + +```bash +yarn install +``` + +Set the version (replacing "" with actual release version e.g. 70.0.0): + +```bash +npm version +``` + +Create an NPM package by running: + +```bash +yarn npm-bundle +``` + +**_Once you have published to npm, the version you have published can never be used again so you want to make sure you have the right files included to do this run:_** + +```bash +npm pack +``` + +Then compare this list with the list of the current version here (https://www.npmjs.com/package/@ons/design-system?activeTab=code) + +If these match or have some expected changes then run this to publish: + +```bash +npm publish --access public +``` + ## Recommended Visual Studio Code Extensions for this project - [axe Accessibility Linter](https://marketplace.visualstudio.com/items?itemName=deque-systems.vscode-axe-linter) From de273be53fcdd20488dabc4cfb282d4ffb147216 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 12:00:40 +0100 Subject: [PATCH 3/5] Bump elliptic from 6.5.4 to 6.5.7 in the npm_and_yarn group (#3317) Bumps the npm_and_yarn group with 1 update: [elliptic](https://github.com/indutny/elliptic). Updates `elliptic` from 6.5.4 to 6.5.7 - [Commits](https://github.com/indutny/elliptic/compare/v6.5.4...v6.5.7) --- updated-dependencies: - dependency-name: elliptic dependency-type: indirect dependency-group: npm_and_yarn ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/yarn.lock b/yarn.lock index 05b21c413a..d01063ad71 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4141,23 +4141,10 @@ electron-to-chromium@^1.4.535: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.557.tgz#f3941b569c82b7bb909411855c6ff9bfe1507829" integrity sha512-6x0zsxyMXpnMJnHrondrD3SuAeKcwij9S+83j2qHAQPXbGTDDfgImzzwgGlzrIcXbHQ42tkG4qA6U860cImNhw== -elliptic@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" - integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== - dependencies: - bn.js "^4.11.9" - brorand "^1.1.0" - hash.js "^1.0.0" - hmac-drbg "^1.0.1" - inherits "^2.0.4" - minimalistic-assert "^1.0.1" - minimalistic-crypto-utils "^1.0.1" - -elliptic@^6.5.5: - version "6.5.5" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.5.tgz#c715e09f78b6923977610d4c2346d6ce22e6dded" - integrity sha512-7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw== +elliptic@^6.5.3, elliptic@^6.5.5: + version "6.5.7" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b" + integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q== dependencies: bn.js "^4.11.9" brorand "^1.1.0" From c74c189a31d88b7a1854dbe2a6bd9592ecab4969 Mon Sep 17 00:00:00 2001 From: Alessio Venturini <112873190+alessioventuriniAND@users.noreply.github.com> Date: Fri, 30 Aug 2024 09:37:28 +0100 Subject: [PATCH 4/5] fixed issues (#3324) --- src/components/card/_macro.njk | 2 +- src/components/hero/_macro.njk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/card/_macro.njk b/src/components/card/_macro.njk index b1eb3dd4bc..72868b4a86 100644 --- a/src/components/card/_macro.njk +++ b/src/components/card/_macro.njk @@ -2,7 +2,7 @@ {% set headingLevel = params.headingLevel | default(2) | string %} {% set openingHeadingTag = "" %} - {% set placeholderSrcset = (params.image.placeholderURL if params.image.placeholderURL) + "/img/small/placeholder-card.png 1x, " + (params.image.placeholderURL if params.image.placeholderURL else "") + "/img/large/placeholder-card.png 2x" %} + {% set placeholderSrcset = (params.image.placeholderURL if params.image.placeholderURL else "") + "/img/small/placeholder-card.png 1x, " + (params.image.placeholderURL if params.image.placeholderURL else "") + "/img/large/placeholder-card.png 2x" %}
diff --git a/src/components/hero/_macro.njk b/src/components/hero/_macro.njk index 7cee7fc917..84d7a33102 100644 --- a/src/components/hero/_macro.njk +++ b/src/components/hero/_macro.njk @@ -21,7 +21,7 @@ {% if params.button %} {% from "components/button/_macro.njk" import onsButton %} - {% set btnClasses = params.button.classes if params.button.classes %} + {% set btnClasses = params.button.classes if params.button.classes else '' %} {% if params.variants and 'dark' in params.variants %} {% set btnClasses = btnClasses + ' ons-btn--ghost' %} {% endif %} From 650f48a9bb14c2ff5079e4418f6c95f1e0c1c899 Mon Sep 17 00:00:00 2001 From: SriHV <123635670+SriHV@users.noreply.github.com> Date: Fri, 30 Aug 2024 10:23:15 +0100 Subject: [PATCH 5/5] Updated color of check icon for summary variant in list component to green (#3318) * changes as per the ticket * Update src/components/list/_list.scss Co-authored-by: rmccar <42928680+rmccar@users.noreply.github.com> * Changes in list macro * changes as per tech session * snapshot update --------- Co-authored-by: rmccar <42928680+rmccar@users.noreply.github.com> Co-authored-by: Alessio Venturini <112873190+alessioventuriniAND@users.noreply.github.com> --- __snapshots__/layout/_template.spec.js.snap | 4 ---- src/components/list/_list.scss | 6 +++++ src/components/list/_macro.njk | 11 ++++++--- src/components/list/_macro.spec.js | 26 +++++++++++++++++++++ 4 files changed, 40 insertions(+), 7 deletions(-) diff --git a/__snapshots__/layout/_template.spec.js.snap b/__snapshots__/layout/_template.spec.js.snap index ba70038df6..3fa2ab0f53 100644 --- a/__snapshots__/layout/_template.spec.js.snap +++ b/__snapshots__/layout/_template.spec.js.snap @@ -1395,7 +1395,6 @@ exports[`base page template matches the full configuration snapshot 1`] = ` -
    @@ -1460,7 +1459,6 @@ exports[`base page template matches the full configuration snapshot 1`] = ` -
      @@ -1525,7 +1523,6 @@ exports[`base page template matches the full configuration snapshot 1`] = ` -
        @@ -1606,7 +1603,6 @@ exports[`base page template matches the full configuration snapshot 1`] = ` -
          diff --git a/src/components/list/_list.scss b/src/components/list/_list.scss index aed32f6748..a55ca32eb3 100644 --- a/src/components/list/_list.scss +++ b/src/components/list/_list.scss @@ -107,6 +107,12 @@ @extend .ons-u-pb-s; @extend .ons-u-m-no; } + .ons-list__prefix, + .ons-list__suffix { + &--icon-check .ons-icon { + fill: var(--ons-color-leaf-green) !important; + } + } } } diff --git a/src/components/list/_macro.njk b/src/components/list/_macro.njk index 6f4f771255..34ae32ef5d 100644 --- a/src/components/list/_macro.njk +++ b/src/components/list/_macro.njk @@ -22,7 +22,6 @@ {% endif %} {% set openingTag = "<" + listEl %} {% set closingTag = "" %} - {{ openingTag | safe }}{% if params.id %}{{ ' ' }}id="{{ params.id }}"{% endif %} class="ons-list{{ ' ons-list--p' if listEl == 'p' }}{{ ' ' + params.classes if params.classes else '' }}{% if params.variants %}{% if params.variants is not string %}{% for variant in variants %}{{ ' ' }}ons-list--{{ variant }}{% endfor %}{% else %}{{ ' ' }}ons-list--{{ variants }}{% endif %}{% endif %}{{ ' ' + otherClasses if otherClasses else '' }}"{% if params.attributes %}{% for attribute, value in (params.attributes.items() if params.attributes is mapping and params.attributes.items else params.attributes) %}{{ ' ' }}{{ attribute }}{% if value %}="{{ value }}"{% endif %}{% endfor %}{% endif %}> {%- for item in params.itemsList -%} @@ -48,7 +47,10 @@ {% endif %} {%- if item.prefix or (params.iconPosition == 'before') -%} - + {%- if item.prefix -%} {{- item.prefix -}}. {% elif params.iconPosition == 'before' %} @@ -87,7 +89,10 @@ {{- itemText | safe -}} {%- endif -%} {%- if item.suffix or (params.iconPosition == 'after') -%} - + {%- if item.suffix -%} {{- item.suffix -}} {%- elif (item.index and listEl != 'ol') or (item.index and listEl == 'ol' and 'bare' in variants) -%} diff --git a/src/components/list/_macro.spec.js b/src/components/list/_macro.spec.js index 09ca3c85f2..fe045d9f58 100644 --- a/src/components/list/_macro.spec.js +++ b/src/components/list/_macro.spec.js @@ -109,6 +109,32 @@ describe('macro: list', () => { expect($('.ons-list').hasClass('ons-list--icons')).toBe(true); }); + it('has the correct icon class when variants is `summary`, `iconType` is `check` and `iconPosition` is before', () => { + const $ = cheerio.load( + renderComponent('list', { + ...EXAMPLE_LIST_TEXT_ITEMS, + iconPosition: 'before', + iconType: 'check', + variants: 'summary', + }), + ); + + expect($('.ons-list__prefix').hasClass('ons-list__prefix--icon-check')).toBe(true); + }); + + it('has the correct icon class when variants is `summary`, `iconType` is `check` and `iconPosition` is `after`', () => { + const $ = cheerio.load( + renderComponent('list', { + ...EXAMPLE_LIST_TEXT_ITEMS, + iconPosition: 'after', + iconType: 'check', + variants: 'summary', + }), + ); + + expect($('.ons-list__suffix').hasClass('ons-list__suffix--icon-check')).toBe(true); + }); + it('renders a
            element by default', () => { const $ = cheerio.load(renderComponent('list', EXAMPLE_LIST_TEXT_ITEMS));