diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ce742a..3810c1d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). +#### [0.2.10](https://github.com/eea/volto-forests-theme/compare/0.2.9...0.2.10) + +- stylelint [`bb88d6e`](https://github.com/eea/volto-forests-theme/commit/bb88d6ef8034df89108a0f386baa033b1afc529c) +- Expandable table mobile views [`5ed9d38`](https://github.com/eea/volto-forests-theme/commit/5ed9d38493e2f2ea05b060f1470b317001701ca5) + #### [0.2.9](https://github.com/eea/volto-forests-theme/compare/0.2.8...0.2.9) +> 5 May 2022 + +- Develop [`#66`](https://github.com/eea/volto-forests-theme/pull/66) - Expandable table popup format changes [`1c0d096`](https://github.com/eea/volto-forests-theme/commit/1c0d09674796c485ad48335dc5f0debdd0712018) - Readmore inline [`167e6ed`](https://github.com/eea/volto-forests-theme/commit/167e6edc30a0037506e32527d11037d5aa785c6b) - Email in expandable popup [`997b71d`](https://github.com/eea/volto-forests-theme/commit/997b71d35400e997de99b3d730c82431fe7ad305) diff --git a/package.json b/package.json index 56533b5..12755fb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@eeacms/volto-forests-theme", - "version": "0.2.9", + "version": "0.2.10", "description": "@eeacms/volto-forests-theme: Volto add-on", "main": "src/index.js", "author": "European Environment Agency: IDM2 A-Team", diff --git a/src/components/manage/Blocks/SimpleDataTable/templates/expandable/PopupRow.jsx b/src/components/manage/Blocks/SimpleDataTable/templates/expandable/PopupRow.jsx index aeea270..af0d07d 100644 --- a/src/components/manage/Blocks/SimpleDataTable/templates/expandable/PopupRow.jsx +++ b/src/components/manage/Blocks/SimpleDataTable/templates/expandable/PopupRow.jsx @@ -199,7 +199,7 @@ const PopupRow = ({ > {popupSchema.title} - + {popupSchema.logo && ( )} - {popupSchema.email && popupSchema.url && ( - - {popupSchema.email && ( - - - Email: - - - {popupSchema.email} - - - )} - {popupSchema.url && ( - - - Website: - - - {popupSchema.url} - - - )} - - )} + + {popupSchema.email && ( + + Email: + + {popupSchema.email} + + + )} + {popupSchema.url && ( + + + Website: + + + {popupSchema.url} + + + )} + {popupSchema.description && ( @@ -253,14 +249,8 @@ const PopupRow = ({ )} - - + + {rowData && ( )} - + {rowData && ( { return ( - + {tableColumns && diff --git a/src/components/manage/Blocks/SimpleDataTable/templates/expandable/style.less b/src/components/manage/Blocks/SimpleDataTable/templates/expandable/style.less index ede2a68..32b33f6 100644 --- a/src/components/manage/Blocks/SimpleDataTable/templates/expandable/style.less +++ b/src/components/manage/Blocks/SimpleDataTable/templates/expandable/style.less @@ -139,6 +139,31 @@ font-size: 1.5rem !important; } +.popup-header-data { + display: flex; + + @media screen and (max-width: 800px) { + flex-direction: column; + } +} + +.popup-columns-container { + display: flex; + justify-content: space-between; + margin: 10px 0; + + @media screen and (max-width: 800px) { + flex-direction: column; + } +} + +.popup-column { + width: 49%; + @media screen and (max-width: 800px) { + width: 100%; + } +} + .popup-url { font-size: 24px; font-weight: bold;
- Email: -
- Website: -
Email:
+ Website: +