From ffe8615a9ca4092dff84533fd45c606b9a4d5442 Mon Sep 17 00:00:00 2001 From: Richard Gaunt Date: Mon, 2 Dec 2024 22:01:58 +1100 Subject: [PATCH 1/3] Remove lint rule. --- web/themes/contrib/civictheme/.stylelintrc.json | 1 + 1 file changed, 1 insertion(+) diff --git a/web/themes/contrib/civictheme/.stylelintrc.json b/web/themes/contrib/civictheme/.stylelintrc.json index 646df9cd89..07cf6d321e 100644 --- a/web/themes/contrib/civictheme/.stylelintrc.json +++ b/web/themes/contrib/civictheme/.stylelintrc.json @@ -33,6 +33,7 @@ "declaration-block-no-redundant-longhand-properties": null, "max-line-length": null, "no-descending-specificity": null, + "no-duplicate-selectors": null, "scss/at-mixin-argumentless-call-parentheses": "always", "scss/at-mixin-pattern": "^_?ct-[a-z0-9\\-]+$", "scss/at-else-closing-brace-newline-after": null, From b68cc2f1b3dee31f402d5b397de8b8e6a685b4be Mon Sep 17 00:00:00 2001 From: Richard Gaunt Date: Tue, 3 Dec 2024 08:40:43 +1100 Subject: [PATCH 2/3] Update checkboxes test for change in uikit. --- .../styleguide.field.checkboxes.feature | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/behat/features/styleguide.field.checkboxes.feature b/tests/behat/features/styleguide.field.checkboxes.feature index ddf37f17d6..2b8f647c4b 100644 --- a/tests/behat/features/styleguide.field.checkboxes.feature +++ b/tests/behat/features/styleguide.field.checkboxes.feature @@ -19,7 +19,7 @@ Feature: Field, Checkboxes And I should see a ".ct-field.js-form-item-test-checkboxes-1 input[id='edit-test-checkboxes-1-option-3']" element And I should see a ".ct-field.js-form-item-test-checkboxes-1 input[id='edit-test-checkboxes-1-option-4']" element And I should see a ".ct-field.js-form-item-test-checkboxes-1 input[id='edit-test-checkboxes-1-option-5']" element - And I should not see a ".ct-field.js-form-item-test-checkboxes-1 input[required]" element + And I should not see a ".ct-field.js-form-item-test-checkboxes-1.ct-field--required input" element And I should not see a ".ct-field.js-form-item-test-checkboxes-1 input[disabled]" element # Validate: Checkboxes, Title visible, default value, no description, no error, required, with attributes @@ -49,8 +49,8 @@ Feature: Field, Checkboxes And I should see a ".ct-field.js-form-item-test-checkboxes-2 input[id='edit-test-checkboxes-2-option-5']" element And I should see a ".ct-field.js-form-item-test-checkboxes-2 input[id='edit-test-checkboxes-2-option-5'][data-test='test-attribute-value']" element And I should see a ".ct-field.js-form-item-test-checkboxes-2 input[id='edit-test-checkboxes-2-option-5'].test-class" element - And I should see a ".ct-field.js-form-item-test-checkboxes-2 input[required]" element - And I should not see a ".ct-field.js-form-item-test-checkboxes-2 input[disabled]" element + And I should see a ".ct-field.js-form-item-test-checkboxes-2.ct-field--required input" element + And I should not see a ".ct-field.js-form-item-test-checkboxes-2.ct-field--disabled input[disabled]" element # Validate: Checkboxes, Title visually hidden, default value, description, no error And I should see an ".ct-field.js-form-item-test-checkboxes-3" element @@ -64,8 +64,8 @@ Feature: Field, Checkboxes And I should see a ".ct-field.js-form-item-test-checkboxes-3 input[id='edit-test-checkboxes-3-option-3']" element And I should see a ".ct-field.js-form-item-test-checkboxes-3 input[id='edit-test-checkboxes-3-option-4']" element And I should see a ".ct-field.js-form-item-test-checkboxes-3 input[id='edit-test-checkboxes-3-option-5']" element - And I should not see a ".ct-field.js-form-item-test-checkboxes-3 input[required]" element - And I should not see a ".ct-field.js-form-item-test-checkboxes-3 input[disabled]" element + And I should not see a ".ct-field.js-form-item-test-checkboxes-3.ct-field--required input" element + And I should not see a ".ct-field.js-form-item-test-checkboxes-3.ct-field--disabled input[disabled]" element # Validate: Checkboxes, Title hidden, no default value, description, required, error And I should see an ".ct-field.js-form-item-test-checkboxes-4" element @@ -78,8 +78,8 @@ Feature: Field, Checkboxes And I should see a ".ct-field.js-form-item-test-checkboxes-4 input[id='edit-test-checkboxes-4-option-3']" element And I should see a ".ct-field.js-form-item-test-checkboxes-4 input[id='edit-test-checkboxes-4-option-4']" element And I should see a ".ct-field.js-form-item-test-checkboxes-4 input[id='edit-test-checkboxes-4-option-5']" element - And I should see a ".ct-field.js-form-item-test-checkboxes-4 input[required]" element - And I should not see a ".ct-field.js-form-item-test-checkboxes-4 input[disabled]" element + And I should see a ".ct-field.js-form-item-test-checkboxes-4.ct-field--required input" element + And I should not see a ".ct-field.js-form-item-test-checkboxes-4.ct-field--disabled input[disabled]" element And I should see a ".ct-field.js-form-item-test-checkboxes-4 .ct-field-message:contains('This is an error message')" element # Validate: Checkboxes, Title visible, default value, no description, disabled @@ -94,5 +94,5 @@ Feature: Field, Checkboxes And I should see a ".ct-field.js-form-item-test-checkboxes-5 input[id='edit-test-checkboxes-5-option-3']" element And I should see a ".ct-field.js-form-item-test-checkboxes-5 input[id='edit-test-checkboxes-5-option-4']" element And I should see a ".ct-field.js-form-item-test-checkboxes-5 input[id='edit-test-checkboxes-5-option-5']" element - And I should not see a ".ct-field.js-form-item-test-checkboxes-5 input[required]" element - And I should see a ".ct-field.js-form-item-test-checkboxes-5 input[disabled]" element + And I should not see a ".ct-field.js-form-item-test-checkboxes-5.ct-field--required input" element + And I should see a ".ct-field.js-form-item-test-checkboxes-5.ct-field--disabled input[disabled]" element From 48deff52066fd0875f39576dc4ddab0e22b93df9 Mon Sep 17 00:00:00 2001 From: Richard Gaunt Date: Wed, 4 Dec 2024 09:17:47 +1100 Subject: [PATCH 3/3] Updated tag of uikit for release. --- web/themes/contrib/civictheme/package-lock.json | 10 +++++----- web/themes/contrib/civictheme/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/themes/contrib/civictheme/package-lock.json b/web/themes/contrib/civictheme/package-lock.json index 6cfec33af9..adb3da93fb 100644 --- a/web/themes/contrib/civictheme/package-lock.json +++ b/web/themes/contrib/civictheme/package-lock.json @@ -10,7 +10,7 @@ "hasInstallScript": true, "license": "GPL-2.0-or-later", "dependencies": { - "@civictheme/uikit": "github:civictheme/uikit#main" + "@civictheme/uikit": "github:civictheme/uikit#v1.9.0" }, "devDependencies": { "@alexskrypnyk/scss-variables-extractor": "^0.1.1", @@ -2240,8 +2240,8 @@ } }, "node_modules/@civictheme/uikit": { - "version": "1.8.2", - "resolved": "git+ssh://git@github.com/civictheme/uikit.git#f64bac1bfbec9e4117a0e480b71a298d7f922ddd", + "version": "1.9.0", + "resolved": "git+ssh://git@github.com/civictheme/uikit.git#2217e3fdf1c9c53e4ea21067eea9e7bae01c6805", "hasInstallScript": true, "license": "GPL-2.0-or-later", "dependencies": { @@ -24420,8 +24420,8 @@ } }, "@civictheme/uikit": { - "version": "git+ssh://git@github.com/civictheme/uikit.git#f64bac1bfbec9e4117a0e480b71a298d7f922ddd", - "from": "@civictheme/uikit@github:civictheme/uikit#main", + "version": "git+ssh://git@github.com/civictheme/uikit.git#2217e3fdf1c9c53e4ea21067eea9e7bae01c6805", + "from": "@civictheme/uikit@github:civictheme/uikit#v1.9.0", "requires": { "@popperjs/core": "^2.11.8" } diff --git a/web/themes/contrib/civictheme/package.json b/web/themes/contrib/civictheme/package.json index 67e9b9b6ea..42dab0c345 100644 --- a/web/themes/contrib/civictheme/package.json +++ b/web/themes/contrib/civictheme/package.json @@ -25,7 +25,7 @@ "uikit-install": "rm -Rf lib/uikit > /dev/null 2>&1 && mkdir -p lib/uikit && cp -R node_modules/@civictheme/uikit lib && rm -Rf lib/uikit/dist lib/uikit/storybook-static > /dev/null 2>&1" }, "dependencies": { - "@civictheme/uikit": "github:civictheme/uikit#main" + "@civictheme/uikit": "github:civictheme/uikit#v1.9.0" }, "devDependencies": { "@alexskrypnyk/scss-variables-extractor": "^0.1.1",