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

Commit fb106e7

Browse files
peterpeterparkerpeterpeterparker
committed
Merge remote-tracking branch 'remotes/origin/master' into enterprise
2 parents dc88860 + e9cdf9a commit fb106e7

File tree

53 files changed

+605
-417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+605
-417
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,15 @@ David
4444
- core: v1.1.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/core/CHANGELOG.md))
4545
- drag-resize-rotate: v1.1.3 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/drag-resize-rotate/CHANGELOG.md))
4646
- highlight-code: v1.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md))
47+
- inline-editor: v1.5.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/inline-editor/CHANGELOG.md))
4748
- social: v2.0.0 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/social/CHANGELOG.md))
4849

4950
### Others
5051

52+
- deck-utils: v2.3.3 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/utils/deck/CHANGELOG.md))
5153
- gatsby-remark-highlight-code: v1.4.4 ([CHANGELOG](https://github.com/deckgo/gatsby-remark-highlight-code/blob/master/CHANGELOG.md))
5254
- slide-utils: v2.1.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/utils/slide/CHANGELOG.md))
53-
- starter kit: v2.6.1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo-starter/blob/master/CHANGELOG.md))
55+
- starter kit: v2.6.2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo-starter/blob/master/CHANGELOG.md))
5456

5557
<a name="1.5.0"></a>
5658

‎README.md‎

Lines changed: 52 additions & 52 deletions
Large diffs are not rendered by default.

‎docs/docs/components/app-components-inline-editor/app-components-inline-editor.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ The `<deckgo-inline-editor/>` expose the following properties:
9696
| `list` | `list` | Actions to manipulate the selection as list enabled? | `boolean` | `true` |
9797
| `align` | `align` | Actions to manipulate the selection alignment enabled? | `boolean` | `true` |
9898
| `fontSize` | `font-size` | Actions to modify the selection font-size enabled? | `boolean` | `true` |
99+
| `backgroundColor` | `background-color` | To hide the option to select a background-color | `boolean` | `true` |
99100

100101
### Custom actions slots
101102

‎docs/docs/slides/app-slide-author/app-slide-author.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ The "Author" slide lets you introduce the author of the presentation.
2424
<deckgo-slide-author img-src="https://secure.meetupstatic.com/photos/member/9/c/4/2/member_272620002.jpeg">
2525
<h1 slot="title">slot="title"</h1>
2626
<div slot="author">slot="author"</div>
27-
<div slot="social-link" style={{fontSize: '0.5rem'}}><deckgo-social twitter="daviddalbusco"><ion-icon area-label="David on Twitter" slot="icon" name="logo-twitter"></ion-icon></deckgo-social></div>
28-
<div slot="social-link" style={{fontSize: '0.5rem'}}><deckgo-social linkedin="david-dal-busco"><ion-icon area-label="David on Linkedin" slot="icon" name="logo-linkedin"></ion-icon></deckgo-social></div>
27+
<div slot="social-link" style={{fontSize: '0.5rem'}}><deckgo-social twitter="daviddalbusco"><ion-icon aria-label="David on Twitter" slot="icon" name="logo-twitter"></ion-icon></deckgo-social></div>
28+
<div slot="social-link" style={{fontSize: '0.5rem'}}><deckgo-social linkedin="david-dal-busco"><ion-icon aria-label="David on LinkedIn" slot="icon" name="logo-linkedin"></ion-icon></deckgo-social></div>
2929
</deckgo-slide-author>
3030
</deckgo-deck>
3131
</div>

‎docs/docs/slides/app-slides-concept/app-slides-concept.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ The core component of [DeckDeckGo](`<deckgo-deck/>`) does not contain any slides
156156
<deckgo-slide-author img-mode="circle" img-src="https://secure.meetupstatic.com/photos/member/9/c/4/2/member_272620002.jpeg">
157157
<h1 slot="title">slot="title"</h1>
158158
<div slot="author">slot="author"</div>
159-
<div slot="social-link" style={{fontSize: '0.5rem'}}><deckgo-social twitter="daviddalbusco"><ion-icon area-label="David on Twitter" slot="icon" name="logo-twitter"></ion-icon></deckgo-social></div>
160-
<div slot="social-link" style={{fontSize: '0.5rem'}}><deckgo-social linkedin="david-dal-busco"><ion-icon area-label="David on Linkedin" slot="icon" name="logo-linkedin"></ion-icon></deckgo-social></div>
159+
<div slot="social-link" style={{fontSize: '0.5rem'}}><deckgo-social twitter="daviddalbusco"><ion-icon aria-label="David on Twitter" slot="icon" name="logo-twitter"></ion-icon></deckgo-social></div>
160+
<div slot="social-link" style={{fontSize: '0.5rem'}}><deckgo-social linkedin="david-dal-busco"><ion-icon aria-label="David on LinkedIn" slot="icon" name="logo-linkedin"></ion-icon></deckgo-social></div>
161161
</deckgo-slide-author>
162162
</deckgo-deck>
163163
</div>

‎docs/package-lock.json‎

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

‎docs/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"@deckdeckgo/charts": "^1.0.2",
1818
"@deckdeckgo/color": "^2.0.0",
1919
"@deckdeckgo/core": "^1.1.0",
20-
"@deckdeckgo/deck-utils": "^2.3.1",
20+
"@deckdeckgo/deck-utils": "^2.3.3",
2121
"@deckdeckgo/demo": "^1.0.4",
2222
"@deckdeckgo/drag-resize-rotate": "^1.1.3",
2323
"@deckdeckgo/highlight-code": "^1.1.2",
24-
"@deckdeckgo/inline-editor": "^1.4.0",
24+
"@deckdeckgo/inline-editor": "^1.5.0",
2525
"@deckdeckgo/lazy-img": "^1.0.1",
2626
"@deckdeckgo/math": "^1.0.1",
2727
"@deckdeckgo/qrcode": "^1.0.1",

‎docs/src/app/pages/docs/components/app-components-inline-editor/app-components-inline-editor.tsx‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,21 @@ export class AppComponentsInlineEditor {
362362
<code>true</code>
363363
</td>
364364
</tr>
365+
<tr>
366+
<td>
367+
<code>backgroundColor</code>
368+
</td>
369+
<td>
370+
<code>background-color</code>
371+
</td>
372+
<td>To hide the option to select a background-color</td>
373+
<td>
374+
<code>boolean</code>
375+
</td>
376+
<td>
377+
<code>true</code>
378+
</td>
379+
</tr>
365380
</tbody>
366381
</table>
367382
<h3 id="app-components-inline-editor-custom-actions-slots">Custom actions slots</h3>

‎docs/src/app/pages/docs/slides/app-slide-author/app-slide-author.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@ export class AppSlideAuthor {
8181
<div slot="author">slot="author"</div>
8282
<div slot="social-link" style={{fontSize: '0.5rem'}}>
8383
<deckgo-social twitter="daviddalbusco">
84-
<ion-icon area-label="David on Twitter" slot="icon" name="logo-twitter"></ion-icon>
84+
<ion-icon aria-label="David on Twitter" slot="icon" name="logo-twitter"></ion-icon>
8585
</deckgo-social>
8686
</div>
8787
<div slot="social-link" style={{fontSize: '0.5rem'}}>
8888
<deckgo-social linkedin="david-dal-busco">
89-
<ion-icon area-label="David on Linkedin" slot="icon" name="logo-linkedin"></ion-icon>
89+
<ion-icon aria-label="David on LinkedIn" slot="icon" name="logo-linkedin"></ion-icon>
9090
</deckgo-social>
9191
</div>
9292
</deckgo-slide-author>

‎docs/src/app/pages/docs/slides/app-slides-concept/app-slides-concept.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,12 @@ export class AppSlidesConcept {
241241
<div slot="author">slot="author"</div>
242242
<div slot="social-link" style={{fontSize: '0.5rem'}}>
243243
<deckgo-social twitter="daviddalbusco">
244-
<ion-icon area-label="David on Twitter" slot="icon" name="logo-twitter"></ion-icon>
244+
<ion-icon aria-label="David on Twitter" slot="icon" name="logo-twitter"></ion-icon>
245245
</deckgo-social>
246246
</div>
247247
<div slot="social-link" style={{fontSize: '0.5rem'}}>
248248
<deckgo-social linkedin="david-dal-busco">
249-
<ion-icon area-label="David on Linkedin" slot="icon" name="logo-linkedin"></ion-icon>
249+
<ion-icon aria-label="David on LinkedIn" slot="icon" name="logo-linkedin"></ion-icon>
250250
</deckgo-social>
251251
</div>
252252
</deckgo-slide-author>

0 commit comments

Comments
 (0)