Merge pull request #5207 from salesforce-ux/merge-summer-23-winter-24

Author: Dottenpixel

RELEASENOTES.general.md

@@ -47,6 +47,12 @@
     - Added `visibility_rule_assigned`
     - Added `walkthroughs`
 
+## 2.21.2 - June 15, 2023
+
+## Fixed
+- Fixed text-selection color issues which was introduced by WCAG 2.1 updates.
+- Fixed border colors for components.
+
 ## 2.21.1 - May 18, 2023
 
 ## Fixed

RELEASENOTES.md

@@ -1,6 +1,7 @@
 <!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
 <!-- !!! THIS FILE IS AUTO-GENERATED !!! DO NOT EDIT THIS FILE MANUALLY !!! -->
 
+<<<<<<< HEAD
 ## Release 2.22.0 - Upcoming
 
 ## Components
@@ -63,6 +64,13 @@
 #### Changed
 - Replaced aria-hidden with hidden attribute for components that show/hide content
 <!-- ## [VERSION] -->
+=======
+## Release 2.21.2 - June 15, 2023
+
+## Fixed
+- Fixed text-selection color issues which was introduced by WCAG 2.1 updates.
+- Fixed border colors for components.
+>>>>>>> 244-summer-23
 
 ## Release 2.21.1 - May 18, 2023
 

ui/_config.scss

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

ui/components/combobox/base/_index.scss

@@ -496,7 +496,7 @@ input[readonly][role="combobox"] {
       display: flex;
       position: relative;
       background: var(--slds-g-color-neutral-base-100, #{$color-background-alt});
-      border: 1px solid var(--slds-g-color-border-base-1, #{$color-border});
+      border: 1px solid var(--slds-g-color-border-base-4, #{$color-border});
       border-top: 0;
       border-bottom-left-radius: $border-radius-medium;
       border-bottom-right-radius: $border-radius-medium;
@@ -589,7 +589,7 @@ input[readonly][role="combobox"] {
 .slds-has-object-switcher {
   flex-direction: row;
   background: var(--slds-g-color-neutral-base-100, #{$color-background-input});
-  border: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
+  border: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
   border-radius: $border-radius-medium;
 
   .slds-combobox {

ui/components/expression/base/_index.scss

@@ -78,7 +78,7 @@
   */
 .slds-expression__group {
   background: var(--slds-g-color-neutral-base-95, #{$color-background});
-  border: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
+  border: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
   border-radius: $border-radius-medium;
   padding: $spacing-small;
   margin-top: $spacing-small;

ui/components/expression/filters/_index.scss

@@ -101,7 +101,7 @@
  */
 .slds-filters__group {
   background: var(--slds-g-color-neutral-base-95, #{$color-background});
-  border: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
+  border: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
   border-radius: $border-radius-medium;
   padding: $spacing-small;
 }

ui/components/feeds/comment/_deprecate.scss

@@ -23,7 +23,7 @@
 
       &:before {
         content: '';
-        background: var(--slds-g-color-border-base-1, #{$color-border});
+        background: var(--slds-g-color-border-base-4, #{$color-border});
         height: 100%;
         width: $border-width-thin;
         position: absolute;

ui/components/feeds/post/_index.scss

@@ -10,8 +10,8 @@
  */
 .slds-feed__item-comments {
   background: var(--slds-g-color-neutral-base-95, #{$color-background-post});
-  border-top: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
-  border-bottom: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
+  border-top: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
+  border-bottom: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
 
   .slds-comment {
     padding: $var-spacing-vertical-x-small $spacing-medium;
@@ -30,7 +30,7 @@
   padding: $spacing-small $spacing-medium;
 
   @include mq-medium-max {
-    border-top: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
+    border-top: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
   }
 
   @include mq-large-min {
@@ -90,7 +90,7 @@
   order: 1;
 
   @include mq-small-max {
-    border-top: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
+    border-top: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
     margin: 0 ($spacing-small * -1) ($spacing-small * -1);
     padding: 0 $spacing-medium;
   }
@@ -197,7 +197,7 @@
   // class .slds-region--narrow
   .slds-post__footer-actions-list {
     order: 1;
-    border-top: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
+    border-top: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
     margin: 0 ($spacing-small * -1) ($spacing-small * -1);
     padding: 0 $spacing-medium;
   }

ui/components/menus/dropdown/_index.scss

@@ -111,7 +111,7 @@
   max-width: $size-medium;
   margin-top: $spacing-xxx-small;
   margin-bottom: $spacing-xxx-small;
-  border: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
+  border: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
   border-radius: $border-radius-medium;
   padding: $spacing-xx-small 0;
   font-size: $font-size-2;

ui/components/pills/base/_deprecate.scss

@@ -15,7 +15,7 @@
     display: flex;
     min-height: calc(#{$height-input} + 2px);
     padding: $spacing-xxx-small;
-    border: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
+    border: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
     border-radius: $border-radius-medium;
     background-color: var(--slds-g-color-neutral-base-100, #{$color-background-input});