Merge branch '244-summer-23' of github.com:salesforce-ux/design-system-internal into opensource-summer-23

Dottenpixel · Dottenpixel · commit a14a35c16808 · 2023-06-30T16:05:45.000-07:00
diff --git a/RELEASENOTES.general.md b/RELEASENOTES.general.md
@@ -1,6 +1,14 @@
 <!-- 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.21.3 - June 29, 2023
+
+## Fixed
+- Correction in icons package version.
+- Updated placeholder text color for Rich Text Editor
+- Updated docked utility component's unread notification state icon color
+- Updated border colors for Feeds component
+
 ## 2.21.2 - June 15, 2023
 
 ## Fixed
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,6 +1,14 @@
 <!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
 <!-- !!! THIS FILE IS AUTO-GENERATED !!! DO NOT EDIT THIS FILE MANUALLY !!! -->
 
+## Release 2.21.3 - June 29, 2023
+
+## Fixed
+- Correction in icons package version.
+- Updated placeholder text color for Rich Text Editor
+- Updated docked utility component's unread notification state icon color
+- Updated border colors for Feeds component
+
 ## Release 2.21.2 - June 15, 2023
 
 ## Fixed
diff --git a/formats/custom-props.js b/formats/custom-props.js
@@ -1,11 +1,11 @@
 const theo = require('theo');
 
 const SLDS = 'slds';
-const SCOPED_NAMESPACE = 'slds-wcag';
+const SCOPED_NAMESPACE = process.env.WCAG_MODE ? ':root' : '.slds-wcag';
 
 theo.registerFormat(
   'custom-props.scss',
-  `.${SCOPED_NAMESPACE} {
+  `${SCOPED_NAMESPACE} {
   {{#each props as |prop|}}
     {{#if prop.comment}}/* {{{prop.comment}}} */{{/if}}
     --${SLDS}-{{#eq prop.scope "global"}}g-{{/eq}}{{#eq prop.scope "shared"}}s-{{/eq}}{{kebabcase prop.name}}: {{#eq prop.type "string"}}"{{/eq}}{{{prop.value}}}{{#eq prop.type "string"}}"{{/eq}};
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "CSS"
   ],
   "homepage": "https://lightningdesignsystem.com",
-  "version": "2.21.2",
+  "version": "2.21.3",
   "author": "Salesforce",
   "bugs": {
     "url": "https://github.com/salesforce-ux/design-system/issues"
@@ -49,7 +49,7 @@
     "@salesforce-ux/design-system-markup": "^2.0.4",
     "@salesforce-ux/design-system-parser": "^1.1.1",
     "@salesforce-ux/design-system-primitive-tokens": "0.3.6",
-    "@salesforce-ux/icons": "^10.6.0",
+    "@salesforce-ux/icons": "10.6.0",
     "@salesforce-ux/instant-vrt": "2.0.0",
     "@salesforce-ux/postcss-annotations-parser": "0.1.1",
     "@salesforce-ux/postcss-css-variable-value": "0.2.0",
diff --git a/ui/_config.scss b/ui/_config.scss
@@ -9,7 +9,7 @@
 ///
 /// @type String
 /// @access private
-$app-version: "2.21.2";
+$app-version: "2.21.3";
 
 /// Debug mode (uncomment to activate)
 /// Turn on to output deprecation warnings during development
diff --git a/ui/components/docked-utility-bar/base/_index.scss b/ui/components/docked-utility-bar/base/_index.scss
@@ -43,8 +43,9 @@
    */
   .slds-indicator_unread,
   .slds-indicator--unread {
-    background: var(--slds-g-color-neutral-base-100, #{$utility-bar-color-background-notification-badge});
+    background: var(--slds-g-color-error-base-40, #{$utility-bar-color-background-notification-badge});
     top: $spacing-x-small;
+    border: $border-width-thin solid var(--slds-g-color-neutral-base-95);
   }
 }
 
diff --git a/ui/components/feeds/post/_index.scss b/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-4, #{$color-border});
-  border-bottom: $border-width-thin solid var(--slds-g-color-border-base-4, #{$color-border});
+  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});
 
   .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-4, #{$color-border});
+    border-top: $border-width-thin solid var(--slds-g-color-border-base-1, #{$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-4, #{$color-border});
+    border-top: $border-width-thin solid var(--slds-g-color-border-base-1, #{$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-4, #{$color-border});
+    border-top: $border-width-thin solid var(--slds-g-color-border-base-1, #{$color-border});
     margin: 0 ($spacing-small * -1) ($spacing-small * -1);
     padding: 0 $spacing-medium;
   }
diff --git a/ui/components/rich-text-editor/base/_index.scss b/ui/components/rich-text-editor/base/_index.scss
@@ -228,7 +228,7 @@
     user-select: text;
 
     &.ql-blank:before {
-      color: var(--slds-g-color-neutral-base-10, #54698d);
+      color: var(--slds-g-color-neutral-base-50, #54698d);
       content: attr(data-placeholder);
       pointer-events: none;
       position: absolute;

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,9 @@`
`43`	`43`	`*/`
`44`	`44`	`.slds-indicator_unread,`
`45`	`45`	`.slds-indicator--unread {`
`46`		`- background: var(--slds-g-color-neutral-base-100, #{$utility-bar-color-background-notification-badge});`
	`46`	`+ background: var(--slds-g-color-error-base-40, #{$utility-bar-color-background-notification-badge});`
`47`	`47`	`top: $spacing-x-small;`
	`48`	`+ border: $border-width-thin solid var(--slds-g-color-neutral-base-95);`
`48`	`49`	`}`
`49`	`50`	`}`
`50`	`51`