Skip to content

Commit 1f39a10

Browse files
committed
Merge branch '238-summer-22' of github.com:salesforce-ux/design-system-internal into merge-summer-22-winter-23
2 parents 39fea1a + 035714e commit 1f39a10

File tree

7 files changed

+28
-17
lines changed

7 files changed

+28
-17
lines changed

RELEASENOTES.general.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
22
<!-- On release, add general notes here. In time the legacy release notes will be add to this -->
33

4-
## 2.18.0 - Upcoming
4+
## 2.18.0 - May 6, 2022
55

66
- Removed `&_` shorthand from numerous selectors in SCSS files
77
- Updated icons to v10.3.0

RELEASENOTES.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
<!-- Release notes authoring guidelines: http://keepachangelog.com/ -->
22
<!-- !!! THIS FILE IS AUTO-GENERATED !!! DO NOT EDIT THIS FILE MANUALLY !!! -->
33

4-
## Release 2.19.0 - April 12, 2022
4+
## Release 2.19.0 - June 1, 2022
55

66
## Components
7-
87
### [Dynamic Icons](https://www.lightningdesignsystem.com/components/dynamic-icons)
98
#### Changed
109
- Updated Global Action Help icon's `role` attribute from `presentation` to `img` for better accessibility compliance
@@ -17,7 +16,7 @@
1716
#### Added
1817
- Added `role="img"` to unread indicator dot to comply with accessibility usage rules for `aria-label`
1918

20-
## Release 2.18.0 - Upcoming
19+
## Release 2.18.0 - May 6, 2022
2120

2221
- Removed `&_` shorthand from numerous selectors in SCSS files
2322
- Updated icons to v10.3.0
@@ -34,6 +33,11 @@
3433
- Added `video_off`
3534

3635
## Components
36+
### [Accordion](https://www.lightningdesignsystem.com/components/accordion)
37+
#### Fixed
38+
- Fix for sass undefined operation compile error.
39+
- Fix wrong computed css margin rules.
40+
3741
### [Button Icons](https://www.lightningdesignsystem.com/components/button-icons)
3842
#### Added
3943
- Added `slds-button_icon-large` to support a Large variant for contained button icons

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"CSS"
99
],
1010
"homepage": "https://lightningdesignsystem.com",
11-
"version": "2.18.0-beta.2",
11+
"version": "2.18.0",
1212
"author": "Salesforce",
1313
"bugs": {
1414
"url": "https://github.com/salesforce-ux/design-system/issues"
@@ -200,7 +200,7 @@
200200
"optionalDependencies": {
201201
"fsevents": "*"
202202
},
203-
"license": "SEE LICENSE IN README.md",
203+
"license": "BSD-3-Clause",
204204
"repository": {
205205
"type": "git",
206206
"url": "[email protected]:salesforce-ux/design-system.git"

ui/_config.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
///
1010
/// @type String
1111
/// @access private
12-
$app-version: "2.17.5";
12+
$app-version: "2.18.0";
1313

1414
/// Debug mode (uncomment to activate)
1515
/// Turn on to output deprecation warnings during development

ui/components/accordion/RELEASENOTES.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,13 @@
44

55
<!-- ## [Unreleased] -->
66

7+
## 2.18.0
8+
9+
### Fixed
10+
11+
- Fix for sass undefined operation compile error.
12+
- Fix wrong computed css margin rules.
13+
714
## 2.17.0
815

916
### Added

ui/components/accordion/base/_index.scss

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,19 @@
3939
margin-top: calc(
4040
var(--slds-c-accordion-section-spacing-block-start,
4141
var(--sds-c-accordion-section-spacing-block-start,
42-
#{$spacing-small} * -1)));
42+
#{$spacing-small})) * -1);
4343
margin-right: calc(
4444
var(--slds-c-accordion-section-spacing-inline-end,
4545
var(--sds-c-accordion-section-spacing-inline-end,
46-
#{$spacing-small} * -1)));
46+
#{$spacing-small})) * -1);
4747
margin-bottom: calc(
4848
var(--slds-c-accordion-section-spacing-block-end,
4949
var(--sds-c-accordion-section-spacing-block-end,
50-
#{$spacing-small} * -1)));
50+
#{$spacing-small})) * -1);
5151
margin-left: calc(
5252
var(--slds-c-accordion-section-spacing-inline-start,
5353
var(--sds-c-accordion-section-spacing-inline-start,
54-
#{$spacing-small} * -1)));
54+
#{$spacing-small})) * -1);
5555
padding-top: var(--slds-c-accordion-section-spacing-block-start, var(--sds-c-accordion-section-spacing-block-start, #{$spacing-small}));
5656
padding-right: var(--slds-c-accordion-section-spacing-inline-end, var(--sds-c-accordion-section-spacing-inline-end, #{$spacing-small}));
5757
padding-bottom: var(--slds-c-accordion-section-spacing-block-end, var(--sds-c-accordion-section-spacing-block-end, #{$spacing-small}));
@@ -91,19 +91,19 @@
9191
margin-top: calc(
9292
var(--slds-c-accordion-section-spacing-block-start,
9393
var(--sds-c-accordion-section-spacing-block-start,
94-
#{$spacing-small} * -1)));
94+
#{$spacing-small})) * -1);
9595
margin-right: calc(
9696
var(--slds-c-accordion-section-spacing-inline-end,
9797
var(--sds-c-accordion-section-spacing-inline-end,
98-
#{$spacing-small} * -1)));
98+
#{$spacing-small})) * -1);
9999
margin-bottom: calc(
100100
var(--slds-c-accordion-section-spacing-block-end,
101101
var(--sds-c-accordion-section-spacing-block-end,
102-
#{$spacing-small} * -1)));
102+
#{$spacing-small})) * -1);
103103
margin-left: calc(
104104
var(--slds-c-accordion-section-spacing-inline-start,
105105
var(--sds-c-accordion-section-spacing-inline-start,
106-
#{$spacing-small} * -1)));
106+
#{$spacing-small})) * -1);
107107
padding-top: var(--slds-c-accordion-section-spacing-block-start, var(--sds-c-accordion-section-spacing-block-start, $spacing-small));
108108
padding-right: var(--slds-c-accordion-section-spacing-inline-end, var(--sds-c-accordion-section-spacing-inline-end, $spacing-small));
109109
padding-bottom: var(--slds-c-accordion-section-spacing-block-end, var(--sds-c-accordion-section-spacing-block-end, $spacing-small));

0 commit comments

Comments
 (0)