Skip to content

Commit

Permalink
Merge branch 'master' into boyscout/fix-vulnerability
Browse files Browse the repository at this point in the history
  • Loading branch information
NoNamer777 authored Sep 5, 2023
2 parents a5cf93c + f380e44 commit 87c3257
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 13 deletions.
3 changes: 2 additions & 1 deletion .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"singleQuote": true,
"arrowParens": "always",
"trailingComma": "all",
"tabWidth": 4
"tabWidth": 4,
"htmlWhitespaceSensitivity": "strict"
}
7 changes: 4 additions & 3 deletions component-sets/default-components/templates/html/image.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<figure class="image">
<div doc-image="image" doc-link="hyperlink"></div>
<figcaption doc-editable="caption">
Image caption, sem vel consectetur dignissim, quam felis molestie lorem, eget posuere felis turpis vitae odio.
</figcaption>
<figcaption doc-editable="caption"
>Image caption, sem vel consectetur dignissim, quam felis molestie lorem, eget posuere felis turpis vitae
odio.</figcaption
>
</figure>
8 changes: 7 additions & 1 deletion docs/PROPERTIES.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,13 @@ Data applied as inline styles to the HTML of the component.

### `data`

Free style data. Does not affect the rendering of the article in the editor.
Free style data. Data properties do not affect the HTML rendition of the article.

In the PSV rendition, data properties are added as attributes to the component tag. This is supported for a specific set of property control types: select, checkbox, radio, text, textarea, url, time, colorPicker and slider. Attributes are prefixed with `data-prop-`. For example, a property named `country` with value `Netherlands`, would result in attribute:

```
data-prop-country="Netherlands"
```

### `doc-<directive>`

Expand Down
17 changes: 10 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
"yargs": "^17.3.1"
},
"devDependencies": {
"prettier": "~2.2.1"
"prettier": "~2.8.4"
}
}

0 comments on commit 87c3257

Please sign in to comment.