Skip to content
This repository was archived by the owner on Feb 6, 2024. It is now read-only.

Commit 1775137

Browse files
Merge pull request #770 from deckgo/landing-split
feat: landing split centered on small devices
2 parents ec58734 + ccc7527 commit 1775137

File tree

10 files changed

+33
-11
lines changed

10 files changed

+33
-11
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
### Web Components: New Templates
1212

1313
- slide-playground: v1.0.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/slides/playground/CHANGELOG.md))
14+
- slide-split: v1.2.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/slides/split/CHANGELOG.md))
1415

1516
### Web Components
1617

docs/docs/slides/app-slide-split/app-slide-split.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,5 +160,7 @@ The following theming options will affect this component if set on its host or p
160160
| --slide-split-text-align | inherit | Modify for example to center if you want to align the text in the middle |
161161
| --slide-split-title-display | none | The `slot` title is per default hidden even if you provide it. If you wish to displays it, modify this attribute |
162162
| --zIndex | 1 | The z-index of the slide |
163+
| --slide-split-display-start | flex | Start side display property |
164+
| --slide-split-display-end | flex | End side display property |
163165

164166
[deckdeckgo]: https://deckdeckgo.com

docs/src/app/pages/docs/slides/app-slide-split/app-slide-split.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,16 @@ export class AppSlideContent {
321321
<td>1</td>
322322
<td>The z-index of the slide</td>
323323
</tr>
324+
<tr>
325+
<td>--slide-split-display-start</td>
326+
<td>flex</td>
327+
<td>Start side display property</td>
328+
</tr>
329+
<tr>
330+
<td>--slide-split-display-end</td>
331+
<td>flex</td>
332+
<td>End side display property</td>
333+
</tr>
324334
</tbody>
325335
</table>
326336
</main>

studio/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

studio/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"@deckdeckgo/slide-playground": "^1.0.1",
3737
"@deckdeckgo/slide-poll": "^1.0.1",
3838
"@deckdeckgo/slide-qrcode": "^1.0.3",
39-
"@deckdeckgo/slide-split": "^1.1.4",
39+
"@deckdeckgo/slide-split": "^1.2.0",
4040
"@deckdeckgo/slide-title": "^1.0.1",
4141
"@deckdeckgo/slide-utils": "^1.1.0",
4242
"@deckdeckgo/slide-youtube": "^1.0.1",

studio/src/app/components/landing/app-landing-deck/app-landing-deck.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,18 @@ app-landing-deck {
5050
width: 100%;
5151
}
5252

53-
@media (max-width: 576px) {
53+
@media (max-width: 768px) {
5454
div[slot="start"] {
5555
h2 {
5656
padding: 0;
5757
}
5858
}
5959

6060
&:first-of-type {
61-
div[slot="end"] {
62-
display: none;
61+
--slide-split-display-end: none;
62+
63+
div[slot="start"] {
64+
text-align: center;
6365
}
6466
}
6567
}

webcomponents/slides/split/CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
# 1.2.0 (2020-06-23)
2+
3+
### Style
4+
5+
- split display in `start` and `end`
6+
17
# 1.1.4 (2020-05-11)
28

3-
### Feat
9+
### Features
410

511
- update Stencil for Gatsby build
612

webcomponents/slides/split/package-lock.json

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

webcomponents/slides/split/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@deckdeckgo/slide-split",
3-
"version": "1.1.4",
3+
"version": "1.2.0",
44
"description": "The Split template is a simple slide to display the content in two columns on a slide of your presentation",
55
"main": "dist/index.js",
66
"module": "dist/index.mjs",

webcomponents/slides/split/src/components/slide/deckdeckgo-slide-split.scss

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,20 @@ div.deckgo-slide-split {
2727
) / 2
2828
);
2929

30-
display: flex;
3130
align-items: var(--slide-split-align, inherit);
3231
text-align: var(--slide-split-text-align, inherit);
3332

3433
padding: var(--slide-split-padding-top, 0) var(--slide-split-padding-end, var(--slide-padding-end-default)) var(--slide-split-padding-bottom, 0)
3534
var(--slide-split-padding-start, var(--slide-padding-start-default));
3635

3736
&.deckgo-slide-split-start {
37+
display: var(--slide-split-display-start, flex);
3838
background: var(--slide-split-background-start);
3939
color: var(--slide-split-color-start);
4040
}
4141

4242
&.deckgo-slide-split-end {
43+
display: var(--slide-split-display-end, flex);
4344
background: var(--slide-split-background-end);
4445
color: var(--slide-split-color-end);
4546
}

0 commit comments

Comments
 (0)