Skip to content

Set margin-bottom of p in rich text of image-text #189

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Sep 4, 2025
Merged

Set margin-bottom of p in rich text of image-text #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
902b93a
5313: Set margin-bottom of p in rich text of image-text
tuj Sep 3, 2025
b8dd7bb
Merge branch 'develop' into feature/5313-p-margin-bottom-in-admin
tuj Sep 4, 2025
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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.

## Unreleased

- [#189](https://github.com/os2display/display-templates/pull/189)
- Set margin-bottom of p element of rich text in image-text.
- [#188](https://github.com/os2display/display-templates/pull/188)
- Fixed issues with calendar single booking layout.
- Added extra description for resourceAvailableText and hasDateAndTime fields.
Expand Down
6 changes: 3 additions & 3 deletions build/image-text-config-develop.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"id": "01FP2SNGFN0BZQH03KCBXHKYHG",
"description": "Mulighed for at sætte billede og tekst, med forskellige visninger.",
"resources": {
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text.js?ts=1744372285281",
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-admin.json?ts=1744372285281",
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-schema.json?ts=1744372285281",
"component": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text.js?ts=1756916686916",
"admin": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-admin.json?ts=1756916686916",
"schema": "https://raw.githubusercontent.com/os2display/display-templates/develop/build/image-text-schema.json?ts=1756916686916",
"assets": [],
"options": {},
"content": {}
Expand Down
6 changes: 3 additions & 3 deletions build/image-text-config-main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"id": "01FP2SNGFN0BZQH03KCBXHKYHG",
"description": "Mulighed for at sætte billede og tekst, med forskellige visninger.",
"resources": {
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text.js?ts=1744372285281",
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-admin.json?ts=1744372285281",
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-schema.json?ts=1744372285281",
"component": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text.js?ts=1756916686916",
"admin": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-admin.json?ts=1756916686916",
"schema": "https://raw.githubusercontent.com/os2display/display-templates/main/build/image-text-schema.json?ts=1756916686916",
"assets": [],
"options": {},
"content": {}
Expand Down
2 changes: 1 addition & 1 deletion build/image-text.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/image-text/image-text.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@

.text {
margin-top: var(--spacer);

p {
margin-bottom: 1em;
}
}

&.full-screen {
Expand Down