Merge pull request #46 from eea/develop

develop
eea · Jun 30, 2022 · 885032d · 885032d
2 parents e274818 + e993629
commit 885032d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,17 @@ 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.6.14](https://github.com/eea/volto-eea-website-theme/compare/0.6.13...0.6.14)
+
+- change(header): show eea information systems on mobile [`abdf181`](https://github.com/eea/volto-eea-website-theme/commit/abdf1819465ba1ca582c2a2d82ec02a137c0cf7f)
+- change(pageheader): share dropdown appears below the share icon [`10aaafc`](https://github.com/eea/volto-eea-website-theme/commit/10aaafc79d03784972b7cf40639077246340eda9)
+- change(pageheader): removed blogger, reddit and stumbleupon sharing links [`0f7d887`](https://github.com/eea/volto-eea-website-theme/commit/0f7d88700076704abb04ba1bf806ab669fe085be)
+
 #### [0.6.13](https://github.com/eea/volto-eea-website-theme/compare/0.6.12...0.6.13)
 
-- Fix double header issue - refs #151713 [`3151229`](https://github.com/eea/volto-eea-website-theme/commit/3151229d27193d6b4a4355419c924d2ddd538e71)
+> 23 June 2022
+
+- Fix double header issue - refs #151713 [`#45`](https://github.com/eea/volto-eea-website-theme/pull/45)
 - Customize EventView - copied unchanged from @plone/volto 16.0.0-alpha.7 [`346fc87`](https://github.com/eea/volto-eea-website-theme/commit/346fc87c0834627efa70ed1303c5ee98a5a17ae2)
 
 #### [0.6.12](https://github.com/eea/volto-eea-website-theme/compare/0.6.11...0.6.12)

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -6,6 +6,7 @@ pipeline {
         NAMESPACE = "@eeacms"
         SONARQUBE_TAGS = "volto.eea.europa.eu,demo-www.eea.europa.eu"
         DEPENDENCIES = ""
+        VOLTO = "alpha"
     }
 
   stages {
@@ -124,8 +125,8 @@ pipeline {
             node(label: 'docker') {
               script {
                 try {
-                  sh '''docker pull plone; docker run -d --rm --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="profile-plone.restapi:blocks" plone fg'''
-                  sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" plone/volto-addon-ci cypress'''
+                  sh '''docker pull eeacms/plone-backend; docker run --rm -d --name="$BUILD_TAG-plone" -e SITE="Plone" -e PROFILES="eea.kitkat:testing" eeacms/plone-backend'''
+                  sh '''docker pull plone/volto-addon-ci; docker run -i --name="$BUILD_TAG-cypress" --link $BUILD_TAG-plone:plone -e NAMESPACE="$NAMESPACE" -e GIT_NAME=$GIT_NAME -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e DEPENDENCIES="$DEPENDENCIES" -e NODE_ENV=development -e VOLTO="$VOLTO" plone/volto-addon-ci cypress'''
                 } finally {
                   try {
                     sh '''rm -rf cypress-reports cypress-results cypress-coverage'''

diff --git a/cypress/support/index.js b/cypress/support/index.js
@@ -27,7 +27,7 @@ coverage-end */
 export const setupBeforeEach = () => {
   cy.autologin();
   cy.createContent({
-    contentType: 'Folder',
+    contentType: 'Document',
     contentId: 'cypress',
     contentTitle: 'Cypress',
   });

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

diff --git a/src/components/theme/Banner/View.jsx b/src/components/theme/Banner/View.jsx
@@ -161,18 +161,10 @@ const View = (props) => {
                                 sharePage(metadata['@id'], 'linkedin');
                               }}
                             />
-                            <Banner.Action icon="blogger b" />
-                            <Banner.Action
-                              icon="ri-reddit-line"
-                              onClick={() => {
-                                sharePage(metadata['@id'], 'reddit');
-                              }}
-                            />
-                            <Banner.Action icon="stumbleupon circle" />
                           </div>
                         </>
                       )}
-                      position="top center"
+                      position="bottom center"
                       size="small"
                       trigger={
                         <Banner.Action

diff --git a/src/customizations/volto/components/theme/Header/Header.jsx b/src/customizations/volto/components/theme/Header/Header.jsx
@@ -83,7 +83,7 @@ const EEAHeader = ({ pathname, token, items, history }) => {
           <Image src={eeaFlag} alt="eea flag"></Image>
           <Header.TopDropdownMenu
             text="An official website of the European Union | How do you Know?"
-            mobileText="An official EU website"
+            mobileText=" "
             icon="chevron down"
             aria-label="dropdown"
             className=""
@@ -110,7 +110,6 @@ const EEAHeader = ({ pathname, token, items, history }) => {
         <Header.TopItem>
           <Header.TopDropdownMenu
             id="theme-sites"
-            className="tablet or lower hidden"
             text={eea.globalHeaderPartnerLinks.title}
             viewportWidth={width}
           >