Skip to content

Commit

Permalink
Merge pull request #77 from marp-team/update-docs-customized-theme
Browse files Browse the repository at this point in the history
Update documentation of customized theme
  • Loading branch information
yhatt authored Sep 20, 2018
2 parents 031762b + 703f1b0 commit f7c802b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
### Fixed

- Fix to parse metadata of theme within important comments ([#74](https://github.com/marp-team/marpit/pull/74), [#76](https://github.com/marp-team/marpit/pull/76))
- Update [documentation of customized theme](https://marpit.marp.app/theme-css?id=customized-theme) to apply changed behavior on v0.1.1 ([#75](https://github.com/marp-team/marpit/pull/75), [#77](https://github.com/marp-team/marpit/pull/77))

## v0.1.1 - 2018-09-18

Expand Down
6 changes: 2 additions & 4 deletions docs/theme-css.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,7 @@ section {
}
```

`@import` must precede all other statements excepted `@charset`. It follows [the original specification][@import].

In addition, an importing theme must add to theme set by using [`Marpit.themeSet.add(css)`](/usage#add-to-theme-set) in advance.
An importing theme must add to theme set by using [`Marpit.themeSet.add(css)`](/usage#add-to-theme-set) in advance.

### `@import-theme` rule

Expand All @@ -164,7 +162,7 @@ section {
}
```

Unlike `@import`, `@import-theme` can place on anywhere of the root of CSS. The imported contents is inserted to the beginning of CSS in order.
`@import` for theme and `@import-theme` can place on anywhere of the root of CSS. The imported contents is inserted to the beginning of CSS in order per rules. (`@import` is processed before `@import-theme`)

## Tweak style through Markdown

Expand Down

0 comments on commit f7c802b

Please sign in to comment.