Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update toolbar icon to match VS Code outline style #105

Merged
merged 5 commits into from
Nov 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscodeignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*/**
!node_modules/**
!.vscodeignore
!images/icon.png
!images/**
!lib/*
!CHANGELOG.md
!LICENSE
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## [Unreleased]

### Changed

- Update toolbar icon to match VS Code outline style ([#105](https://github.com/marp-team/marp-vscode/pull/105))

## v0.11.1 - 2019-11-17

### Added
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
We will enhance your VS Code as the slide deck writer. Mark `marp: true`, and write your deck!

<p align="center">
<img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/images/screenshot.png" width="800" />
<img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/docs/screenshot.png" width="800" />
</p>

See the documentation of [Marpit Markdown](https://marpit.marp.app/markdown) and [the features of Marp Core](https://github.com/marp-team/marp-core#features) about how to write.
Expand All @@ -33,10 +33,10 @@ marp: true
Start writing!
```

It also can toggle by opening the quick picker from toolbar icon <img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/images/icon.png" width="16" height="16" /> and selecting **"Toggle Marp preview for current Markdown"**. (`markdown.marp.toggleMarpPreview`).
It also can toggle by opening the quick picker from toolbar icon <img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/images/icon-light.svg?sanitize=true" width="16" height="16" /> and selecting **"Toggle Marp preview for current Markdown"**. (`markdown.marp.toggleMarpPreview`).

<p align="center">
<img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/images/toggle.gif" alt="Toggle Marp preview" width="600" />
<img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/docs/toggle.gif" alt="Toggle Marp preview" width="600" />
</p>

## Features
Expand All @@ -49,10 +49,10 @@ Marp for VS Code can preview your Marp Markdown with the same way as [a native M

We have integrated [Marp CLI][marp-cli] to export your deck into several formats.

To export the content of active Markdown editor, open the quick pick from Marp icon on toolbar <img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/images/icon.png" width="16" height="16" /> and select **"Export slide deck..."**. (`markdown.marp.export`)
To export the content of active Markdown editor, open the quick pick from Marp icon on toolbar <img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/images/icon-light.svg?sanitize=true" width="16" height="16" /> and select **"Export slide deck..."**. (`markdown.marp.export`)

<p align="center">
<img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/images/export.gif" alt="Export slide deck" width="600" />
<img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/docs/export.gif" alt="Export slide deck" width="600" />
</p>

You can also execute command from the Command Palette (<kbd>F1</kbd> or <kbd>Ctrl/Cmd+Shift+P</kbd>).
Expand Down Expand Up @@ -109,15 +109,15 @@ theme: your-theme
Markdown preview will reload updated theme CSS automatically when you edited the registered local CSS file. It's very useful for creating your own theme.

<p align="center">
<img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/images/custom-theme.gif" alt="Use custom theme" width="600" />
<img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/docs/custom-theme.gif" alt="Use custom theme" width="600" />
</p>

### Outline view for each slide

We extend [a native outline view](https://code.visualstudio.com/docs/languages/markdown#_outline-view) to support slide pages in Marp Markdown.

<p align="center">
<img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/images/outline.png" alt="Outline view for each slide" width="400" />
<img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/docs/outline.png" alt="Outline view for each slide" width="400" />
</p>

> ℹ️ Please choose `Sort By: Position` from context menu of its panel if you see incorrect slide order.
Expand All @@ -127,7 +127,7 @@ We extend [a native outline view](https://code.visualstudio.com/docs/languages/m
You can fold the content of slide in editor while editing Marp Markdown.

<p align="center">
<img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/images/fold.gif" alt="Slide folding in editor" width="360" />
<img src="https://raw.githubusercontent.com/marp-team/marp-vscode/master/docs/fold.gif" alt="Slide folding in editor" width="360" />
</p>

### Enable HTML in Marp Markdown
Expand Down
File renamed without changes
31 changes: 31 additions & 0 deletions docs/example.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
---
marp: true
theme: uncover
_class: invert
---

![w:160](https://marp.app/assets/marp-logo.svg)

# **Marp for VS Code**

## Create slide deck written in [Marp] Markdown on VS Code <!--fit-->

We will enhance your VS Code as the slide deck writer. Mark `marp: true`, and write your deck!

[marp]: https://marp.app/

---

## Usage

Marp preview for Markdown document will be enabled when `marp: true` is written in front-matter.

```markdown
---
marp: true
---

# Your slide deck

Start writing!
```
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added docs/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
1 change: 1 addition & 0 deletions images/icon-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions images/icon-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed images/screenshot.png
Binary file not shown.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
"command": "markdown.marp.showQuickPick",
"title": "Show quick pick of Marp commands...",
"icon": {
"dark": "./images/icon.png",
"light": "./images/icon.png"
"dark": "./images/icon-dark.svg",
"light": "./images/icon-light.svg"
}
},
{
Expand Down