Skip to content

Commit 7789684

Browse files
authored
Merge branch 'main' into feat-handout
2 parents b045893 + 591b633 commit 7789684

File tree

4 files changed

+16
-3
lines changed

4 files changed

+16
-3
lines changed

docs/builtin/layouts.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,4 +214,10 @@ This shows on the left
214214
# Right
215215

216216
This shows on the right
217+
218+
<style>
219+
.two-cols-header {
220+
column-gap: 20px; /* Adjust the gap size as needed */
221+
}
222+
</style>
217223
```

docs/features/remote-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ You can open a [Cloudflare Quick Tunnels](https://developers.cloudflare.com/clou
5252
::: code-group
5353

5454
```bash [pnpm]
55-
pnpm dev -- --remote --tunnel
55+
pnpm dev --remote --tunnel
5656
# i.e. slidev --remote --tunnel
5757
```
5858

packages/client/layouts/two-cols-header.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@ This shows on the left
1313
This shows on the right
1414
::bottom::
1515
This shows at the bottom, aligned to the end (bottom) of the grid
16+
17+
<style>
18+
.two-cols-header {
19+
column-gap: 20px; /* Adjust the gap size as needed */
20+
}
21+
</style>
1622
```
1723
-->
1824

@@ -48,7 +54,7 @@ const props = defineProps({
4854
.two-cols-header {
4955
display: grid;
5056
grid-template-columns: repeat(2, 1fr);
51-
grid-template-rows: repeat(2, 1fr);
57+
grid-template-rows: auto 1fr auto;
5258
}
5359
5460
.col-header {

packages/slidev/node/commands/build.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,10 @@ export async function build(
9494
height: Math.round(options.data.config.canvasWidth / options.data.config.aspectRatio),
9595
routerMode: options.data.config.routerMode,
9696
waitUntil: 'networkidle',
97-
timeout: 30000,
97+
timeout: args.timeout || 30000,
9898
perSlide: true,
9999
omitBackground: false,
100+
dark: args.dark,
100101
})
101102

102103
const tempFiles = await fs.readdir(tempDir)

0 commit comments

Comments
 (0)