Skip to content

Commit 55489b7

Browse files
JosefBredereckJosefBredereck
committed
Merge remote-tracking branch 'upstream/dev' into dev
2 parents c8c4bf6 + 0a5283d commit 55489b7

File tree

15 files changed

+106
-24
lines changed

15 files changed

+106
-24
lines changed

‎packages/uikit-workshop/CHANGELOG.md

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,68 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [5.11.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/compare/v5.10.2...v5.11.1) (2020-06-28)
7+
8+
9+
### Bug Fixes
10+
11+
* update Viewport Size toggle to better handle async-loaded ishControl data + prevent rendering errors ([b937706](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/b93770669c6f723128ba68e522c9398cc1d2d70c))
12+
* update Webpack config to point to the patched version of preact-dom ([d3660b7](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/d3660b78bc0a74c52ed85b69b023c612b789c318))
13+
* visually hide NavToggle icon text; fix for visual regression after merging down https://github.com/pattern-lab/patternlab-node/pull/1227 ([3a2ad9f](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/3a2ad9f12d83b6d21dcca62e89d944a6a46342f6))
14+
* **patternflyouts:** preventing horizontal scrollbar in pattern flyouts in Edge 18 [#1124](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1124) ([63300bc](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/63300bc00ee797e38bfdb73fdc7694c188a423dc))
15+
* **patternstate:** added css color for pattern state "inprogress" [#1216](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1216) ([856bcda](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/856bcda150239928bb5e8719246b97e9fa366468))
16+
* **resetcss:** selector in uikit-workshop [#1109](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1109) ([6893b7c](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/6893b7cb5478309d4fdab0121edba3921718bd69))
17+
18+
19+
20+
21+
22+
# [5.11.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/compare/v5.10.2...v5.11.0) (2020-06-28)
23+
24+
25+
### Bug Fixes
26+
27+
* update Viewport Size toggle to better handle async-loaded ishControl data + prevent rendering errors ([b937706](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/b93770669c6f723128ba68e522c9398cc1d2d70c))
28+
* update Webpack config to point to the patched version of preact-dom ([d3660b7](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/d3660b78bc0a74c52ed85b69b023c612b789c318))
29+
* visually hide NavToggle icon text; fix for visual regression after merging down https://github.com/pattern-lab/patternlab-node/pull/1227 ([3a2ad9f](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/3a2ad9f12d83b6d21dcca62e89d944a6a46342f6))
30+
* **patternflyouts:** preventing horizontal scrollbar in pattern flyouts in Edge 18 [#1124](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1124) ([63300bc](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/63300bc00ee797e38bfdb73fdc7694c188a423dc))
31+
* **patternstate:** added css color for pattern state "inprogress" [#1216](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1216) ([856bcda](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/856bcda150239928bb5e8719246b97e9fa366468))
32+
* **resetcss:** selector in uikit-workshop [#1109](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1109) ([6893b7c](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/6893b7cb5478309d4fdab0121edba3921718bd69))
33+
34+
35+
36+
37+
38+
## [5.10.2](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/compare/v5.10.1...v5.10.2) (2020-05-24)
39+
40+
41+
### Bug Fixes
42+
43+
* update link to new PL docs homepage ([831b467](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/831b467c57b9259c32ce3d3ddf366fe1867a48a9))
44+
45+
46+
47+
48+
49+
## [5.10.1](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/compare/v5.10.0...v5.10.1) (2020-05-09)
50+
51+
**Note:** Version bump only for package @pattern-lab/uikit-workshop
52+
53+
54+
55+
56+
57+
# [5.10.0](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/compare/v5.9.3...v5.10.0) (2020-05-09)
58+
59+
60+
### Bug Fixes
61+
62+
* **uikitworkshop:** preventing cropping pattern parts [#1174](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/issues/1174) ([6a67d03](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/commit/6a67d039048129e9837c3b6eb3e195ed2e86a815))
63+
64+
65+
66+
67+
668
## [5.9.3](https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop/compare/v5.9.2...v5.9.3) (2020-05-01)
769

870

‎packages/uikit-workshop/package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@pattern-lab/uikit-workshop",
3-
"version": "5.9.3",
3+
"version": "5.11.1",
44
"description": "Front-end assets and templates for the default Pattern Lab workshop view",
55
"main": "gulpfile.js",
66
"scripts": {
@@ -32,9 +32,9 @@
3232
"repository": "https://github.com/pattern-lab/patternlab-node/tree/master/packages/uikit-workshop",
3333
"bugs": "https://github.com/pattern-lab/patternlab-node/issues",
3434
"devDependencies": {
35-
"@pattern-lab/core": "^5.9.3",
36-
"@pattern-lab/engine-handlebars": "^5.5.0",
37-
"@pattern-lab/engine-mustache": "^5.0.0",
35+
"@pattern-lab/core": "^5.11.1",
36+
"@pattern-lab/engine-handlebars": "^5.10.1",
37+
"@pattern-lab/engine-mustache": "^5.10.1",
3838
"better-opn": "^1.0.0",
3939
"browser-sync": "^2.26.7",
4040
"ejs": "^2.7.2",
@@ -151,5 +151,6 @@
151151
"views",
152152
"views-twig",
153153
"webpack.config.js"
154-
]
154+
],
155+
"gitHead": "80f62be442223e09bafb30d0529cbd768e03f2ac"
155156
}

‎packages/uikit-workshop/src/html/index.html

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
<script
3636
src="styleguide/js/patternlab-viewer.modern.js"
3737
type="module"
38+
crossorigin
3839
></script>
3940
<script>
4041
// https://gist.github.com/samthor/64b114e4a4f539915a95b91ffd340acc
@@ -61,7 +62,12 @@
6162
}
6263
})();
6364
</script>
64-
<script src="styleguide/js/patternlab-viewer.js" defer nomodule></script>
65+
<script
66+
src="styleguide/js/patternlab-viewer.js"
67+
defer
68+
nomodule
69+
crossorigin
70+
></script>
6571

6672
<script>
6773
// Check that service workers are registered

‎packages/uikit-workshop/src/sass/pattern-lab.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@
106106
}
107107

108108
.pl-c-main {
109-
overflow: hidden;
109+
overflow-x: hidden;
110+
min-height: 100vh;
110111
max-width: 100vw;
111112
padding-left: .5rem;
112113
padding-right: .5rem;

‎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-
{categoryName}
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={{

0 commit comments

Comments
 (0)