Merge tag 'v2.26.2' into release/opensource

Author: Dottenpixel

RELEASENOTES.general.md

@@ -1,6 +1,8 @@
 <!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
 <!-- On release, add general notes here. In time the legacy release notes will be add to this -->
 
+## 2.26.2 - February 6, 2025
+
 ## 2.26.1 - January 30, 2025
 
 - Update icons to `v10.11.2`

RELEASENOTES.md

@@ -1,6 +1,13 @@
 <!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
 <!-- !!! THIS FILE IS AUTO-GENERATED !!! DO NOT EDIT THIS FILE MANUALLY !!! -->
 
+## Release 2.26.2 - February 6, 2025
+
+## Component Blueprints
+### [Form Element](https://www.lightningdesignsystem.com/components/form-element)
+#### Fixed
+- Move clear fix from 2.26.1 to target specific selectors, use clearfix mixin to avoid more edge cases (e.g. background colors)
+
 ## Release 2.26.1 - January 30, 2025
 
 - Update icons to `v10.11.2`

package-lock.json

@@ -8,7 +8,7 @@
     "CSS"
   ],
   "homepage": "https://lightningdesignsystem.com",
-  "version": "2.26.1",
+  "version": "2.26.2",
   "author": "Salesforce",
   "bugs": {
     "url": "https://github.com/salesforce-ux/design-system/issues"

package.json

@@ -9,7 +9,7 @@
 ///
 /// @type String
 /// @access private
-$app-version: "2.26.1";
+$app-version: "2.26.2";
 
 /// Debug mode (uncomment to activate)
 /// Turn on to output deprecation warnings during development

ui/_config.scss

@@ -4,6 +4,12 @@
 
 <!-- ## [Unreleased] -->
 
+## 2.26.2
+
+### Fixed
+
+- Move clear fix from 2.26.1 to target specific selectors, use clearfix mixin to avoid more edge cases (e.g. background colors)
+
 ## 2.26.1
 
 ### Fixed
@@ -13,6 +19,7 @@
 ## 2.26.0
 
 ### Fixed
+
 - Fixed input dropdown visibility issue in ff and safari caused by container query in a previous fix
 - Changed the alignment of address form element. This fixes the alignment issue in cases where help text is present.
 - Record form .slds-form__item width is now fluid when parent container is less than 280px

ui/components/form-element/RELEASENOTES.md

@@ -58,13 +58,6 @@
   }
 
   @include mq-medium-min {
-
-    // Ensure the form element is cleared to reset the float of the label
-    // Note: Avoid a bug where longer length labels may overlap with form element below
-    .slds-form-element.slds-form-element_horizontal {
-      clear: both;
-    }
-
     // Handle label - default behavior
     .slds-form-element__label {
       float: left;
@@ -146,3 +139,14 @@
     margin-left: 33%;
   }
 }
+
+// Bugfix: Avoid a bug where longer length labels may overlap with form element below
+// - Ensure the form element is cleared to reset the `float: left` of the label within the form element
+// - Cannot use `&.slds-form-element` in the main block above, because of `.slds-form_horizontal .slds-form-element,`
+.slds-form-element_horizontal.slds-form-element,
+.slds-form_horizontal .slds-form-element,
+.slds-form_stacked .slds-form-element_horizontal.slds-form-element {
+  @include mq-medium-min {
+    @include clearfix;
+  }
+}