Merge branch 'develop' into feature/CIVIC-1946-new-build

civictheme · Dec 16, 2024 · af0f8d8 · af0f8d8
2 parents dbd6f3c + 055d6e1
commit af0f8d8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git 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
diff --git 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,

diff --git a/web/themes/contrib/civictheme/package-lock.json b/web/themes/contrib/civictheme/package-lock.json