From 71cb691d37487df3ac9f862052ec2a3a1e06b303 Mon Sep 17 00:00:00 2001 From: buckhalt Date: Tue, 6 May 2025 10:25:48 -0700 Subject: [PATCH 1/3] backport toggle button group color fix --- src/components/Fields/ToggleButtonGroup.js | 2 +- src/styles/components/form/fields/_toggle-button.scss | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Fields/ToggleButtonGroup.js b/src/components/Fields/ToggleButtonGroup.js index 5448f8b4..907cd85f 100644 --- a/src/components/Fields/ToggleButtonGroup.js +++ b/src/components/Fields/ToggleButtonGroup.js @@ -53,7 +53,7 @@ class ToggleButtonGroup extends PureComponent { onChange: this.handleClickOption, }} label={optionLabel} - color={`cat-color-seq-${index + 1}`} + color={`cat-color-seq-${index}`} /> ); }; diff --git a/src/styles/components/form/fields/_toggle-button.scss b/src/styles/components/form/fields/_toggle-button.scss index 6cfeeca2..315ac2f4 100644 --- a/src/styles/components/form/fields/_toggle-button.scss +++ b/src/styles/components/form/fields/_toggle-button.scss @@ -106,8 +106,8 @@ $component-name: form-field-togglebutton; } } -@for $i from 1 through 20 { - $sequence-number: $i % 11; +@for $i from 0 through 20 { + $sequence-number: $i % 10 + 1; .form-field-togglebutton-cat-color-seq-#{$i} { .form-field-togglebutton__checkbox { &::before { From 5dde6e30093459bcaccca51d0c4f3fc922c64519 Mon Sep 17 00:00:00 2001 From: buckhalt Date: Tue, 6 May 2025 10:30:25 -0700 Subject: [PATCH 2/3] update actions --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 98b887c6..88dedd6e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,14 +11,14 @@ jobs: preflight: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 # Set node version - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: node-version: '12.14.1' # Cache node_modules - - uses: actions/cache@v2 + - uses: actions/cache@v4 env: cache-name: cache-node-modules with: From 30631f33cffabe031bb3b4969680b98dce563191 Mon Sep 17 00:00:00 2001 From: buckhalt Date: Tue, 6 May 2025 10:47:46 -0700 Subject: [PATCH 3/3] bump package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 957c90e8..c4a70766 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@codaco/ui", - "version": "5.8.5", + "version": "5.8.6", "description": "Styles and React components for the Network Canvas project", "main": "lib/components/index.js", "license": "GPL-3.0-or-later",