Skip to content

Commit

Permalink
Merge pull request #120 from jrit/cheerio-node-12
Browse files Browse the repository at this point in the history
v1.1.0 release updates
  • Loading branch information
jrit committed May 4, 2015
2 parents c59601d + 54efc66 commit 05ab3af
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
6 changes: 2 additions & 4 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
Next Release
1.1.0 / 2015-05-04
==================

* Fix order of inlined style properties. Now sorted by selector
specificity, resulting in the same computed styles that the original
CSS would have had.
* Fix order of inlined style properties. Now sorted by selector specificity, resulting in the same computed styles that the original CSS would have had.
* Add option to inline pseudo elements as <span> elements

1.0.2 / 2015-04-27
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ All juice methods take an options object that can contain any of these propertie
* `preserveMediaQueries` - preserves all media queries (and contained styles) within `<style></style>` tags as a refinement when `removeStyleTags` is `true`. Other styles are removed. Defaults to `false`.
* `applyWidthAttributes` - whether to use any CSS pixel widths to create `width` attributes on elements set in `juice.widthElements`. Defaults to `false`.
* `applyAttributesTableElements` - whether to create attributes for styles in `juice.styleToAttribute` on elements set in `juice.tableElements`. Defaults to `false`.
* `webResources` - An options object that will be passed through to web-resource-inliner for juice functions that will get remote resources (`juiceResources` and `juiceFile`). Defaults to `{}`.
* `inlinePseudoElements` - Whether to insert pseudo elements (`::before` and `::after`) as `<span>` into the dom. *Note*: Inserting pseudo elements will modify the dom and may conflict with css selectors elsewhere on the page (e.g., `:last-child`).
* `webResources` - An options object that will be passed to [web-resource-inliner](https://www.npmjs.com/package/web-resource-inliner) for juice functions that will get remote resources (`juiceResources` and `juiceFile`). Defaults to `{}`.
* `inlinePseudoElements` - Whether to insert pseudo elements (`::before` and `::after`) as `<span>` into the DOM. *Note*: Inserting pseudo elements will modify the DOM and may conflict with CSS selectors elsewhere on the page (e.g., `:last-child`).

### Methods

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "juice",
"version": "1.0.2",
"version": "1.1.0",
"description": "Inlines css into html source",
"bin": "./bin/juice",
"scripts": {
Expand Down

0 comments on commit 05ab3af

Please sign in to comment.