Merge pull request #35 from eea/develop

Refs #34 ensure floated images don't spill over next accordion titles
eea · Oct 25, 2021 · 645810a · 645810a
2 parents 55e1bd5 + 6e799e8
commit 645810a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,15 @@ 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).
 
+#### [3.4.7](https://github.com/eea/volto-accordion-block/compare/3.4.6...3.4.7)
+
+- Refs #34 ensure floated images from content area don't spill over next accordion title [`79abc8c`](https://github.com/eea/volto-accordion-block/commit/79abc8c1b13eb26fb78b9dbe53fc2711c02a1ed1)
+
 #### [3.4.6](https://github.com/eea/volto-accordion-block/compare/3.4.5...3.4.6)
 
+> 6 October 2021
+
+- Release: Add italian translations [`#33`](https://github.com/eea/volto-accordion-block/pull/33)
 - Italian translations [`#32`](https://github.com/eea/volto-accordion-block/pull/32)
 - chore: added italian translations [`54b6f8f`](https://github.com/eea/volto-accordion-block/commit/54b6f8f8d92e5fd02e18c6e2a8cc81b7abef7312)
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -4,7 +4,7 @@ pipeline {
   environment {
         GIT_NAME = "volto-accordion-block"
         NAMESPACE = "@eeacms"
-        SONARQUBE_TAGS = "volto.eea.europa.eu,forest.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu"
+        SONARQUBE_TAGS = "volto.eea.europa.eu,forest.eea.europa.eu,www.eea.europa.eu-ims,climate-energy.eea.europa.eu,sustainability.eionet.europa.eu,biodiversity.europa.eu,clms.land.copernicus.eu"
         DEPENDENCIES = ""
     }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-accordion-block",
-  "version": "3.4.6",
+  "version": "3.4.7",
   "description": "volto-accordion-block: Volto accordion block",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/components/manage/Blocks/Accordion/editor.less b/src/components/manage/Blocks/Accordion/editor.less
@@ -86,6 +86,7 @@
 .accordion-block {
   .accordion {
     margin-top: 0 !important;
+    clear: both; /* ensure floated images from content area don't spill over next accordion title */
   }
 
   .accordion-title {