Skip to content

Commit

Permalink
Merge branch 'dev' into refactor/updated-lerna-dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
mfranzke authored Dec 3, 2021
2 parents 2bb2e4e + 6fa630e commit f52ba9a
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 17,587 deletions.
6 changes: 6 additions & 0 deletions packages/docs/src/docs/advanced-config-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ Sets whether or not you want the styleguide to load with the pattern info open o

**default**: `false`

## defaultInitialViewportWidth (optional)

Possibility to define whether the initial viewport width on opening pattern lab in the browser should take the default of `100%` (value `true`) or take the (permanently) persisted value after the users have interacted with the viewport resize buttons previously (value `false`). This is especially beneficial in case that you'd expect the pages in full viewport at revisits, and even further if your startpage is defined as a "static" markdown welcome / orientation page.

**default**: `false`

## defaultPatternInfoPanelCode (optional)

Sets default active pattern info code panel by file extension - if unset, uses the value out of _patternExtension_ config value, or instead use value `html` to display the html code initially, or the value defined for the _patternExtension_.
Expand Down
3 changes: 2 additions & 1 deletion packages/live-server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,12 @@ LiveServer.start = function (options) {
// Use http-auth if configured
if (htpasswd !== null) {
const auth = require('http-auth');
const authConnect = require('http-auth-connect');
const basic = auth.basic({
realm: 'Please authorize',
file: htpasswd,
});
app.use(auth.connect(basic));
app.use(authConnect(basic));
}

if (cors) {
Expand Down
3 changes: 2 additions & 1 deletion packages/live-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"cors": "2.8.5",
"event-stream": "3.3.4",
"faye-websocket": "0.11.x",
"http-auth": "3.2.x",
"http-auth": "4.1.x",
"http-auth-connect": "^1.0.5",
"morgan": "1.10.0",
"object-assign": "4.1.1",
"opn": "5.3.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
}
],
"meta": {
"description": "To add to these items, use Sass variables that start with <code>$font-family-</code> in <code>./source/css/scss/abstracts/_variables.scss</code>"
"description": ""
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
---
order: 2
---
---

To add to these items, use Sass variables that start with `$font-family-` in `./source/css/scss/abstracts/_variables.scss`
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
}
],
"meta": {
"description": "To add to these items, use Sass variables that start with <code>$font-size-</code> in <code>./source/css/scss/abstracts/_variables.scss</code>"
"description": ""
}
}
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
---
order: 2
---
---

To add to these items, use Sass variables that start with `$font-size-` in `./source/css/scss/abstracts/_variables.scss`
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ class IFrame extends BaseLitComponent {
const url = urlHandler.getFileName(this.getPatternParam());

const initialWidth =
!window.config.defaultInitialViewportWidth &&
store.getState().app.viewportPx &&
store.getState().app.viewportPx <= this.clientWidth
? store.getState().app.viewportPx + 'px;'
Expand Down
Loading

0 comments on commit f52ba9a

Please sign in to comment.