Skip to content

Commit ca6b640

Browse files
committed
Merge branch 'main' into feature/indent-description-list-dd
# Conflicts: # public/dist/assets/js/multiselect.min.js # public/dist/assets/styles/core.min.css
2 parents 9aadc03 + d51dc0d commit ca6b640

File tree

7 files changed

+12
-5
lines changed

7 files changed

+12
-5
lines changed

assets-src/js/multiselect-module.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ const MultiselectButtons = function (selectEl, params) {
193193
ulCombo.setAttribute('aria-multiselectable', 'true');
194194
ulCombo.id = baseId + '-listbox';
195195
ulCombo.setAttribute('aria-labelledby', baseId + '-label');
196-
ulCombo.classList.add('combo-menu');
196+
ulCombo.classList.add('combo-menu', 'clean-list');
197197

198198
div.appendChild(divComboBox);
199199
div.appendChild(ulCombo);

assets-src/js/slider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ let contentSlider = (function () {
6666
function createControls() {
6767

6868
let controls = document.createElement('ul');
69-
controls.setAttribute('class', 'slider-controls');
69+
controls.setAttribute('class', 'clean-list slider-controls');
7070
controls.setAttribute('aria-label', controlsDescription);
7171
controls.innerHTML = '<li><button class="button button--ghost js-previous with-icon--larger" aria-label="' + previousSlide + '" style="padding:0.4375rem;"><svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em"><path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/><path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/></svg></button></li>'
7272
+ '<li style="margin-top:0;margin-inline-start:0.25rem;"><button class="button button--ghost js-next with-icon--larger" aria-label="' + nextSlide + '" style="padding:0.4375rem;"><svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em"><path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/><path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/></svg></button></li>';

assets-src/styles/sass/50-core-components/_evangelists.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@
4545
padding-right: rem(24);
4646
}
4747

48+
.l-box {
49+
padding: rem(24);
50+
}
51+
4852
li + li {
4953
border-top: solid 1px #649bc5;
5054
}

public/dist/assets/js/multiselect.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ const MultiselectButtons = function (selectEl, params) {
198198
ulCombo.setAttribute('aria-multiselectable', 'true');
199199
ulCombo.id = baseId + '-listbox';
200200
ulCombo.setAttribute('aria-labelledby', baseId + '-label');
201-
ulCombo.classList.add('combo-menu');
201+
ulCombo.classList.add('combo-menu', 'clean-list');
202202
div.appendChild(divComboBox);
203203
div.appendChild(ulCombo);
204204
if (selectEl.multiple) {

public/dist/assets/js/slider.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ let contentSlider = function () {
332332
*/
333333
function createControls() {
334334
let controls = document.createElement('ul');
335-
controls.setAttribute('class', 'slider-controls');
335+
controls.setAttribute('class', 'clean-list slider-controls');
336336
controls.setAttribute('aria-label', controlsDescription);
337337
controls.innerHTML = '<li><button class="button button--ghost js-previous with-icon--larger" aria-label="' + previousSlide + '" style="padding:0.4375rem;"><svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em"><path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/><path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/></svg></button></li>' + '<li style="margin-top:0;margin-inline-start:0.25rem;"><button class="button button--ghost js-next with-icon--larger" aria-label="' + nextSlide + '" style="padding:0.4375rem;"><svg xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 320 512" class="icon icon--larger" focusable="false" aria-hidden="true" width="1em" height="1em"><path class="chevron-left" d="M34.52 239.03L228.87 44.69c9.37-9.37 24.57-9.37 33.94 0l22.67 22.67c9.36 9.36 9.37 24.52.04 33.9L131.49 256l154.02 154.75c9.34 9.38 9.32 24.54-.04 33.9l-22.67 22.67c-9.37 9.37-24.57 9.37-33.94 0L34.52 272.97c-9.37-9.37-9.37-24.57 0-33.94z"/><path class="chevron-right" d="M285.476 272.971L91.132 467.314c-9.373 9.373-24.569 9.373-33.941 0l-22.667-22.667c-9.357-9.357-9.375-24.522-.04-33.901L188.505 256 34.484 101.255c-9.335-9.379-9.317-24.544.04-33.901l22.667-22.667c9.373-9.373 24.569-9.373 33.941 0L285.475 239.03c9.373 9.372 9.373 24.568.001 33.941z"/></svg></button></li>';
338338
controls.style.display = 'inline-flex';

public/dist/assets/js/slider.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/dist/assets/styles/core.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3602,6 +3602,9 @@ a.tag, .tag.heading-anchor {
36023602
padding-left: 1.5rem;
36033603
padding-right: 1.5rem;
36043604
}
3605+
.component--evangelists__list .l-box {
3606+
padding: 1.5rem;
3607+
}
36053608
.component--evangelists__list li + li {
36063609
border-top: solid 1px #649bc5;
36073610
}

0 commit comments

Comments
 (0)