Merge pull request #18 from eea/develop

Apply has-banner class only if the banner is visible
eea · Apr 8, 2022 · d0a5fbd · d0a5fbd
2 parents 3ff80d3 + d2c626e
commit d0a5fbd
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git 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).
 
+#### [2.2.0](https://github.com/eea/volto-banner/compare/2.1.0...2.2.0)
+
+- Bumped to version 2.2 [`e1043a1`](https://github.com/eea/volto-banner/commit/e1043a1727fb717690f20b106508207ea83f2781)
+- Apply has-banner class only if the banner is visible [`9c0792b`](https://github.com/eea/volto-banner/commit/9c0792ba0d7aa6891fc02f31dbe35a94cb320a28)
+
 #### [2.1.0](https://github.com/eea/volto-banner/compare/2.0.0...2.1.0)
 
+> 9 March 2022
+
+- Add banner close button [`#17`](https://github.com/eea/volto-banner/pull/17)
 - bump version [`3987512`](https://github.com/eea/volto-banner/commit/3987512e7d129fe098e44c5530b3df8d71d8d0b4)
 - [Feature #146857] Separate close behaviour for static and dynamic banner [`6a29aa2`](https://github.com/eea/volto-banner/commit/6a29aa2ed162ffdd354f7d9cc5708b7233972442)
 - [Feature #146857] Add banner close button - code review fix [`3274f93`](https://github.com/eea/volto-banner/commit/3274f935b5d21f87ed1e15ebe9a117847200a811)

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

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-banner",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "@eeacms/volto-banner: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

diff --git a/src/StagingBanner.jsx b/src/StagingBanner.jsx
@@ -57,7 +57,6 @@ const StagingBanner = ({ banner, token, dispatch }) => {
 
   return (
     <Portal node={node}>
-      <BodyClass className="has-banner" />
       {bannerIsVisible(
         token,
         staticBannerVisible && staticBanner.enabled,
@@ -67,6 +66,7 @@ const StagingBanner = ({ banner, token, dispatch }) => {
           className={cx('stagingBanner static-banner', staticBanner.type)}
           icon
         >
+          <BodyClass className="has-banner" />
           <Container>
             <Message.Content>
               <Message.Header>{staticBanner.title}</Message.Header>
@@ -110,6 +110,7 @@ const StagingBanner = ({ banner, token, dispatch }) => {
             )}
             icon
           >
+            <BodyClass className="has-banner" />
             <Container>
               <Message.Content>
                 <Message.Header>{dynamicBanner.title}</Message.Header>