Skip to content

Commit ab64675

Browse files
authored
Merge branch 'dev' into style-docs-preventing-horizontally-scrolling-pages
2 parents 4e0034c + 8888050 commit ab64675

File tree

7 files changed

+12
-7
lines changed

7 files changed

+12
-7
lines changed

packages/uikit-workshop/src/sass/scss/01-abstracts/_variables.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ $pl-color-trans-white-25: rgba(255, 255, 255, 0.25);
2424
$pl-color-state-info: #02a4d5;
2525
$pl-color-state-complete: #03790f;
2626
$pl-color-state-inreview: #c7a118;
27+
$pl-color-state-inprogress: #b00b02;
2728
$pl-color-state-deprecated: #b00b02;
2829

2930
// Font Family

packages/uikit-workshop/src/sass/scss/02-base/_reset.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
box-sizing: border-box;
1717
}
1818

19-
button {
19+
button[class|="pl-c"] {
2020
font-size: inherit;
2121
background-color: transparent;
2222
}

packages/uikit-workshop/src/sass/scss/04-components/_pattern-states.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
background-color: $pl-color-state-inreview;
2323
}
2424

25+
&--inprogress {
26+
background-color: $pl-color-state-inprogress;
27+
}
28+
2529
&--deprecated {
2630
background-color: $pl-color-state-deprecated;
2731
}

packages/uikit-workshop/src/scripts/components/pl-nav/pl-nav.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ pl-nav {
586586
opacity: 1;
587587

588588
.pl-c-body--theme-horizontal & {
589-
overflow: auto;
589+
overflow-y: auto;
590590
}
591591

592592
@media all and (min-width: $pl-bp-med) {

packages/uikit-workshop/src/scripts/components/pl-nav/src/NavList.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export const NavList = props => {
3636
aria-controls={category}
3737
onClick={elem.toggleSpecialNavPanel}
3838
>
39-
{category}
39+
Expand / Collapse {category} Panel
4040
</NavToggle>
4141
)}
4242
</div>

packages/uikit-workshop/src/scripts/components/pl-nav/src/NavToggle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export const NavToggle = props => {
77
role="tab"
88
{...props}
99
>
10-
{props.children}
10+
<span class="is-vishidden">{props.children}</span>
1111
<span
1212
class="pl-c-nav__link-icon"
1313
dangerouslySetInnerHTML={{

packages/uikit-workshop/src/scripts/utils/iframe-msg-data-extraction.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
* Does the origin sending the message match the current host?
33
* if not dev/null the request
44
*
5-
* @param {MessageEvent} e A message received by a target object.
5+
* @param {MessageEvent} event A message received by a target object.
66
*/
7-
export function iframeMsgDataExtraction(e) {
7+
export function iframeMsgDataExtraction(event) {
88
if (
99
window.location.protocol !== 'file:' &&
1010
event.origin !== window.location.protocol + '//' + window.location.host
1111
) {
12-
return;
12+
return {};
1313
}
1414

1515
try {

0 commit comments

Comments
 (0)