From 70eeb7edbbcafea2dabafb86fa68ed733d736c9e Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Tue, 12 Mar 2019 19:16:21 +0900 Subject: [PATCH 1/6] Parse direction keyword for advanced backgrounds --- src/markdown/background_image/advanced.js | 4 +++ src/markdown/background_image/apply.js | 3 ++ src/markdown/background_image/parse.js | 4 +++ test/markdown/background_image.js | 34 +++++++++++++++++++++++ 4 files changed, 45 insertions(+) diff --git a/src/markdown/background_image/advanced.js b/src/markdown/background_image/advanced.js index 2f7cbb1f..44bac83d 100644 --- a/src/markdown/background_image/advanced.js +++ b/src/markdown/background_image/advanced.js @@ -31,6 +31,9 @@ function advancedBackground(md) { const { height, images, open, width } = t.meta.marpitBackground open.attrSet('data-marpit-advanced-background', 'content') + // Aligned direction + const direction = t.meta.marpitBackground.direction || 'horizontal' + // Split backgrounds const splitSide = t.meta.marpitBackground.split if (splitSide) { @@ -61,6 +64,7 @@ function advancedBackground(md) { { tag: 'div', 'data-marpit-advanced-background-container': true, + 'data-marpit-advanced-background-direction': direction, }, (() => { const imageTokens = [] diff --git a/src/markdown/background_image/apply.js b/src/markdown/background_image/apply.js index 2ac70afb..a00c5799 100644 --- a/src/markdown/background_image/apply.js +++ b/src/markdown/background_image/apply.js @@ -32,6 +32,7 @@ function backgroundImageApply(md) { current.svgContent.meta = { ...(current.svgContent.meta || {}), marpitBackground: { + direction: current.direction, height: current.svgContent.attrGet('height'), images: current.images, open: current.open, @@ -61,6 +62,7 @@ function backgroundImageApply(md) { if (t.type === 'image') { const { background, + backgroundDirection, backgroundColor, backgroundSize, backgroundSplit, @@ -100,6 +102,7 @@ function backgroundImageApply(md) { } } + if (backgroundDirection) current.direction = backgroundDirection if (backgroundSplit) current.split = backgroundSplit } } diff --git a/src/markdown/background_image/parse.js b/src/markdown/background_image/parse.js index d0123a5c..2721afa2 100644 --- a/src/markdown/background_image/parse.js +++ b/src/markdown/background_image/parse.js @@ -47,6 +47,10 @@ function backgroundImageParse(md) { // Split background keyword if (opt === 'left' || opt === 'right') marpitImage.backgroundSplit = opt + + // Background aligned direction + if (opt === 'vertical' || opt === 'horizontal') + marpitImage.backgroundDirection = opt } } } diff --git a/test/markdown/background_image.js b/test/markdown/background_image.js index 9618dbe4..44091ba3 100644 --- a/test/markdown/background_image.js +++ b/test/markdown/background_image.js @@ -243,6 +243,7 @@ describe('Marpit background image plugin', () => { expect(foreignObject.attr('x')).toBe('50%') }) + context( 'when multiple keyword for split background defined in a same slide', () => { @@ -259,6 +260,39 @@ describe('Marpit background image plugin', () => { } ) + describe('Direction keyword', () => { + it('assigns data attribute of the keyword for direction as horizontal by default', () => { + const $ = $load(mdSVG().render('![bg](img1) ![bg](img2)')) + const container = $('div[data-marpit-advanced-background-container]') + + expect( + container.attr('data-marpit-advanced-background-direction') + ).toBe('horizontal') + }) + + context('with vertical keyword', () => { + it('assigns data attribute of the keyword for direction as vertical', () => { + const $ = $load(mdSVG().render('![bg vertical](img1) ![bg](img2)')) + const container = $('div[data-marpit-advanced-background-container]') + + expect( + container.attr('data-marpit-advanced-background-direction') + ).toBe('vertical') + }) + }) + + it('uses the last defined direction when defined multiple directions', () => { + const $ = $load( + mdSVG().render('![bg vertical](img1) ![bg horizontal](img2)') + ) + const container = $('div[data-marpit-advanced-background-container]') + + expect( + container.attr('data-marpit-advanced-background-direction') + ).toBe('horizontal') + }) + }) + context('when filters option of parse image plugin is enabled', () => { it('assigns filter style with the function of filter', () => { const filters = { From 5e439fb7660403071a91c202315c14bc38557196 Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Tue, 12 Mar 2019 19:22:52 +0900 Subject: [PATCH 2/6] Update PostCSS plugin to toggle BG direction --- src/postcss/advanced_background.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/postcss/advanced_background.js b/src/postcss/advanced_background.js index 597113d0..3246d2d3 100644 --- a/src/postcss/advanced_background.js +++ b/src/postcss/advanced_background.js @@ -33,6 +33,10 @@ section[data-marpit-advanced-background="background"] > div[data-marpit-advanced width: 100%; } +section[data-marpit-advanced-background="background"] > div[data-marpit-advanced-background-container][data-marpit-advanced-background-direction="vertical"] { + flex-direction: column; +} + section[data-marpit-advanced-background="background"][data-marpit-advanced-background-split] > div[data-marpit-advanced-background-container] { width: 50%; } From 072b9d18dce33dad00436b380773c25042ad5be4 Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Wed, 13 Mar 2019 00:17:15 +0900 Subject: [PATCH 3/6] Update docs to explain direction keyword w/ image --- .../image-syntax/multiple-bg-vertical.png | Bin 0 -> 24182 bytes docs/assets/image-syntax/multiple-bg.png | Bin 0 -> 17740 bytes docs/image-syntax.md | 50 ++++++++++++++---- docs/index.html | 2 +- docs/introduction.md | 16 +++--- docsify/_layout.scss | 35 +++++++++++- 6 files changed, 84 insertions(+), 19 deletions(-) create mode 100644 docs/assets/image-syntax/multiple-bg-vertical.png create mode 100644 docs/assets/image-syntax/multiple-bg.png diff --git a/docs/assets/image-syntax/multiple-bg-vertical.png b/docs/assets/image-syntax/multiple-bg-vertical.png new file mode 100644 index 0000000000000000000000000000000000000000..7b063f00ab7bc1f54c5818dd3de67068f629f4f2 GIT binary patch literal 24182 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 i1yK3_T_|`j-i1(%zvc)|QBi#lL#~`Tqf!ulnBr literal 0 HcmV?d00001 diff --git a/docs/image-syntax.md b/docs/image-syntax.md index c46a6f32..16242096 100644 --- a/docs/image-syntax.md +++ b/docs/image-syntax.md @@ -4,13 +4,13 @@ Marpit has extended Markdown image syntax `![](image.jpg)` to be helpful creatin | Features | Inline image | Slide BG | Advanced BG | | :--------------------------------: | :----------: | :------: | :---------: | -| [Resizing by keywords][resizing] | `auto` only | ✅ | ✅ | -| [Resizing by percentage][resizing] | ❌ | ✅ | ✅ | -| [Resizing by length][resizing] | ✅ | ✅ | ✅ | -| [Image filters][filters] | ✅ | ❌ | ✅ | -| [Background color][bgcolor] | - | ✅ | ✅ | -| [Multiple backgrounds][multiple] | - | ❌ | ✅ | -| [Split backgrounds][split] | - | ❌ | ✅ | +| [Resizing by keywords][resizing] | `auto` only | ✅ | ✅ | +| [Resizing by percentage][resizing] | ❌ | ✅ | ✅ | +| [Resizing by length][resizing] | ✅ | ✅ | ✅ | +| [Image filters][filters] | ✅ | ❌ | ✅ | +| [Background color][bgcolor] | - | ✅ | ✅ | +| [Multiple backgrounds][multiple] | - | ❌ | ✅ | +| [Split backgrounds][split] | - | ❌ | ✅ | [resizing]: #resizing-image [filters]: #image-filters @@ -129,13 +129,41 @@ The advanced backgrounds support [multiple backgrounds][multiple], [split backgr ### Multiple backgrounds +
+ ```markdown -![bg](https://example.com/backgroundA.jpg) -![bg](https://example.com/backgroundB.jpg) -![bg](https://example.com/backgroundC.jpg) +![bg](https://fakeimg.pl/800x600/0288d1/fff/?text=A) +![bg](https://fakeimg.pl/800x600/02669d/fff/?text=B) +![bg](https://fakeimg.pl/800x600/67b8e3/fff/?text=C) +``` + + + +[Multiple backgrounds](/assets/image-syntax/multiple-bg.png ':ignore') + + +
+ +These images will arrange in a horizontal row. + +#### Direction keyword + +You may change alignment direction from horizontal to vertical, by using `vertical` direction keyword. + +
+ +```markdown +![bg vertical](https://fakeimg.pl/800x600/0288d1/fff/?text=A) +![bg](https://fakeimg.pl/800x600/02669d/fff/?text=B) +![bg](https://fakeimg.pl/800x600/67b8e3/fff/?text=C) ``` -These images will arrange in a row. + + +[Multiple backgrounds with vertical direction](/assets/image-syntax/multiple-bg-vertical.png ':ignore') + + +
### Split backgrounds diff --git a/docs/index.html b/docs/index.html index f8a0d86a..be6cd24d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -35,7 +35,7 @@ diff --git a/docs/introduction.md b/docs/introduction.md index ef165052..eb2f11dc 100644 --- a/docs/introduction.md +++ b/docs/introduction.md @@ -1,12 +1,16 @@ [marp]: https://github.com/marp-team/marp/ [marp-core]: https://github.com/marp-team/marp-core -

- [![Marpit](./marpit.png ':size=500')](/) -

-

- **Marpit**: Markdown slide deck framework -

+
+ +[![Marpit](./marpit.png ':size=500')](/) + +
+
+ +**Marpit**: Markdown slide deck framework + +
--- diff --git a/docsify/_layout.scss b/docsify/_layout.scss index 6c27aea5..c34d53ad 100644 --- a/docsify/_layout.scss +++ b/docsify/_layout.scss @@ -97,6 +97,39 @@ $important-color: complement($brand-primary); } } + // Slide example + .example { + display: flex; + align-items: center; + + > * { + flex: 1; + } + + > .image { + flex: 0 0 calc(25% + 20px); + padding: 0 0 0 20px; + + img { + display: block; + width: 100%; + max-width: 240px; + margin: 0 auto; + } + } + + @media (max-width: 47.99em) { + flex-direction: column; + align-items: stretch; + + > .image { + flex: 0; + padding: 0; + align-self: center; + } + } + } + @media (max-width: 30em) { .table-wrapper { overflow-x: auto; @@ -115,7 +148,7 @@ $important-color: complement($brand-primary); box-shadow: 0 0 40px var(--mono-tint2); &::-webkit-scrollbar { - width: 3px; + width: 3px !important; } &::-webkit-scrollbar-thumb { background-color: var(--mono-tint2); From 3569c3b9ed066018110c37939f94bb38bb49f226 Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Wed, 13 Mar 2019 00:19:42 +0900 Subject: [PATCH 4/6] Fix prettier --- docs/image-syntax.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/image-syntax.md b/docs/image-syntax.md index 16242096..48465bed 100644 --- a/docs/image-syntax.md +++ b/docs/image-syntax.md @@ -4,13 +4,13 @@ Marpit has extended Markdown image syntax `![](image.jpg)` to be helpful creatin | Features | Inline image | Slide BG | Advanced BG | | :--------------------------------: | :----------: | :------: | :---------: | -| [Resizing by keywords][resizing] | `auto` only | ✅ | ✅ | -| [Resizing by percentage][resizing] | ❌ | ✅ | ✅ | -| [Resizing by length][resizing] | ✅ | ✅ | ✅ | -| [Image filters][filters] | ✅ | ❌ | ✅ | -| [Background color][bgcolor] | - | ✅ | ✅ | -| [Multiple backgrounds][multiple] | - | ❌ | ✅ | -| [Split backgrounds][split] | - | ❌ | ✅ | +| [Resizing by keywords][resizing] | `auto` only | ✅ | ✅ | +| [Resizing by percentage][resizing] | ❌ | ✅ | ✅ | +| [Resizing by length][resizing] | ✅ | ✅ | ✅ | +| [Image filters][filters] | ✅ | ❌ | ✅ | +| [Background color][bgcolor] | - | ✅ | ✅ | +| [Multiple backgrounds][multiple] | - | ❌ | ✅ | +| [Split backgrounds][split] | - | ❌ | ✅ | [resizing]: #resizing-image [filters]: #image-filters From 6b98667ff36f4b9e5186f458097691d847e6afea Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Wed, 13 Mar 2019 00:42:29 +0900 Subject: [PATCH 5/6] Disable no-descending-specificity stylelint rule in docs style --- docsify/_layout.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/docsify/_layout.scss b/docsify/_layout.scss index c34d53ad..c112ca9c 100644 --- a/docsify/_layout.scss +++ b/docsify/_layout.scss @@ -154,6 +154,7 @@ $important-color: complement($brand-primary); background-color: var(--mono-tint2); } + /* stylelint-disable-next-line no-descending-specificity */ > h1 img { max-height: 100px; } From cb1e3b7dddb179e272f1adfad6772baeaed02c50 Mon Sep 17 00:00:00 2001 From: Yuki Hattori Date: Wed, 13 Mar 2019 16:22:10 +0900 Subject: [PATCH 6/6] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c700ad2..4259e459 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## [Unreleased] +### Added + +- Direction keyword for advanced background ([#138](https://github.com/marp-team/marpit/pull/138)) + ### Changed - Upgrade Node and dependent packages to the latest version ([#140](https://github.com/marp-team/marpit/pull/140))