Merge pull request #86 from eea/develop

Upgrade volto-arcgis-block version

CHANGELOG.md

@@ -4,8 +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).
 
+#### [1.0.27](https://github.com/eea/volto-clms-theme/compare/1.0.26...1.0.27)
+
+- Bug fixing [`#85`](https://github.com/eea/volto-clms-theme/pull/85)
+- volto-arcgis-block release 0.1.4 [`ce6a181`](https://github.com/eea/volto-clms-theme/commit/ce6a18199e1b266033dd356ce5cd1fb054737b18)
+- to render without values [`7745842`](https://github.com/eea/volto-clms-theme/commit/77458426aeb32c08556754e3d52ccf1a0ee9845b)
+
 #### [1.0.26](https://github.com/eea/volto-clms-theme/compare/1.0.25...1.0.26)
 
+> 24 September 2021
+
+- Develop [`#84`](https://github.com/eea/volto-clms-theme/pull/84)
 - Home carousel [`#83`](https://github.com/eea/volto-clms-theme/pull/83)
 - volto-tabs-block style reverted [`#82`](https://github.com/eea/volto-clms-theme/pull/82)
 - accordion icons customization [`6a81d74`](https://github.com/eea/volto-clms-theme/commit/6a81d74736ea8b1cbe41a04bc38010a29761eaf5)
@@ -190,14 +199,11 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Header fixes [`#54`](https://github.com/eea/volto-clms-theme/pull/54)
 - Toolbar and header depends on logged user rol and other blocks fixes [`#53`](https://github.com/eea/volto-clms-theme/pull/53)
 - replace @collective/volto-dropdownmenu with volto-dropdownmenu [`07f004f`](https://github.com/eea/volto-clms-theme/commit/07f004fe0219e403fb51bc045c83d34f3b981f76)
-- yarn.lock [`fe1ca04`](https://github.com/eea/volto-clms-theme/commit/fe1ca04889d29fe7b653db4c69af2751b84b8a1a)
 - add NODE_ENV parameter [`101f27c`](https://github.com/eea/volto-clms-theme/commit/101f27c25b8fbd192e1b11865e95cf5ffee08c1b)
 - upgrade volto-dropdownmenu version [`2081855`](https://github.com/eea/volto-clms-theme/commit/2081855301f4c708776e0dbab39db143cee00dbc)
 - HomeSearch block missing url behaviour [`d20a378`](https://github.com/eea/volto-clms-theme/commit/d20a378ce3f254b8343692348f314bf281974542)
 - babel configuration [`203ea2d`](https://github.com/eea/volto-clms-theme/commit/203ea2de07f99ca3403e4ca220ca74d7ce69b61d)
 - prettier [`e79e26b`](https://github.com/eea/volto-clms-theme/commit/e79e26bf2fa40ba7b4eb53a24dabd87928221c28)
-- add yarn lock [`e1ab28b`](https://github.com/eea/volto-clms-theme/commit/e1ab28b060d5a74431c368b0de82a68dabce1eab)
-- Jenkinsfile cypress test [`b385d65`](https://github.com/eea/volto-clms-theme/commit/b385d65986f717c60f8c434a08fc11b829d08eb4)
 - cypress [`a243cf0`](https://github.com/eea/volto-clms-theme/commit/a243cf0182fa3dd113c16ff495c71e310252d83b)
 - some fixes [`046279b`](https://github.com/eea/volto-clms-theme/commit/046279b9d05bea8a64eca03eed493e02621534c9)
 - home search block new features [`e31d76c`](https://github.com/eea/volto-clms-theme/commit/e31d76c8bb84df0e78aaf11e83eadc7aa9e268da)
@@ -466,7 +472,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - clmsDatasetDetailView basic scheme [`e6d6d06`](https://github.com/eea/volto-clms-theme/commit/e6d6d06654c20bdd5aa97648123a7edc23182068)
 - new card block [`54d7b04`](https://github.com/eea/volto-clms-theme/commit/54d7b0423b3b397257221b6b86597689ab752df0)
 - button error fixed [`09dd065`](https://github.com/eea/volto-clms-theme/commit/09dd065609ab2e43ce7094583bc9a2b4c8a3d4d3)
-- Configure release for Jenkins [`5ab0f2e`](https://github.com/eea/volto-clms-theme/commit/5ab0f2e71643dae16bc014fb01025e250268f715)
 - button block editor bug fixed [`ba82990`](https://github.com/eea/volto-clms-theme/commit/ba829908ae723b8e0dd204247a664c75083fbff2)
 - cclButtonBlock dynamic schema simplified [`a15451b`](https://github.com/eea/volto-clms-theme/commit/a15451bc9340d321436a2584bab046ba4bcde49d)
 - button block component [`016c87a`](https://github.com/eea/volto-clms-theme/commit/016c87a4cec82fdcd11dc9ca729db016d60a50d0)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",
@@ -29,7 +29,7 @@
   ],
   "dependencies": {
     "volto-dropdownmenu": "2.2.7",
-    "@eeacms/volto-arcgis-block": "0.1.3",
+    "@eeacms/volto-arcgis-block": "0.1.4",
     "@fortawesome/fontawesome-svg-core": "1.2.35",
     "@fortawesome/free-solid-svg-icons": "5.15.3",
     "@fortawesome/free-regular-svg-icons": "5.15.3",
@@ -112,4 +112,4 @@
     "@cypress/code-coverage": "^3.9.5",
     "babel-plugin-transform-class-properties": "^6.24.1"
   }
-}
+}

src/components/CLMSDatasetDetailView/MetadataContent.jsx

@@ -47,13 +47,13 @@ const MetadataContent = (data) => {
         <CclInfoDescription
           title="Lineage"
           tooltip="General explanation of the data produce knowledge's about the lineage of a dataset"
-          description={<StringToHTML string={data.qualityLineage.data} />}
+          description={<StringToHTML string={data.qualityLineage?.data} />}
         />
         <CclInfoDescription
           title="Spatial resolution"
           tooltip="A set of zero to many resolution distances (typically for gridded data and imagery-derived products) or equivalent scales (typically for maps or map-derived products)"
           description={
-            <StringToHTML string={data.qualitySpatialResolution.data} />
+            <StringToHTML string={data.qualitySpatialResolution?.data} />
           }
         />
       </CclInfoContainer>
@@ -63,7 +63,7 @@ const MetadataContent = (data) => {
           title="Specification"
           tooltip="A citation of the implementing rules adopted under Article 7(1) of Directive 2007/2/EC or other specification to which a particular resource conforms"
           description={
-            <StringToHTML string={data.conformitySpecification.data} />
+            <StringToHTML string={data.conformitySpecification?.data} />
           }
         />
       </CclInfoContainer>
@@ -73,14 +73,14 @@ const MetadataContent = (data) => {
           title="Conditions applying to access and use"
           tooltip="Restriction on the access and use of a resource or metadata"
           description={
-            <StringToHTML string={data.accessAndUseConstraints.data} />
+            <StringToHTML string={data.accessAndUseConstraints?.data} />
           }
         />
         <CclInfoDescription
           title="Limitation of public access"
           tooltip="Limitation and other reason for public access"
           description={
-            <StringToHTML string={data.accessAndUseLimitationPublic.data} />
+            <StringToHTML string={data.accessAndUseLimitationPublic?.data} />
           }
         />
       </CclInfoContainer>
@@ -89,13 +89,13 @@ const MetadataContent = (data) => {
         <CclInfoDescription
           title="Responsible party"
           tooltip="Organisation associated with the resource. Organisation name, contact information (email)."
-          description={<StringToHTML string="{data.owners.data}" />}
+          description={<StringToHTML string="{data.owners?.data}" />}
         />
         <CclInfoDescription
           title="Responsible party role"
           tooltip="Function performed by the party"
           description={
-            <StringToHTML string="{data.responsiblePartyRole.data}" />
+            <StringToHTML string="{data.responsiblePartyRole?.data}" />
           }
         />
       </CclInfoContainer>

src/components/CclCard/CclCard.jsx

@@ -100,7 +100,7 @@ function CclCard(props) {
                   <FontAwesomeIcon icon={['fas', 'map-marker-alt']} />
                   <div className="card-event-where-text">{card?.location}</div>
                 </div>
-                <p className="card-description">{card?.description}</p>
+                <p className="card-event-description">{card?.description}</p>
               </div>
             </>
           )}

src/components/CclCard/cards.less

@@ -21,7 +21,6 @@
   width: 8rem;
   height: 6rem;
   object-fit: cover;
-  opacity: 0.5;
 }
 
 .card-text {
@@ -51,35 +50,43 @@
 .card-line-color {
   position: relative;
   display: flex;
+  width: 100%;
   padding: 0;
   margin-bottom: 1rem;
   background-color: #a0b1280f;
 }
 
-.card-line-color .card-text {
-  padding: 1.5rem;
-}
-
 .card-line-color .card-image {
+  width: 12rem;
+  height: 12rem;
   margin: 0;
 }
 
-.card-line-color .card-button {
-  margin-top: 1.5rem;
-}
-
 .card-line-color img {
-  width: 20vw;
+  width: 100%;
   height: 100%;
   object-fit: cover;
-  opacity: 0.5;
 }
+
+.card-line-color .card-text {
+  width: auto;
+  padding: 1.5rem;
+}
+
+.card-line-color .card-button {
+  margin-top: 1.5rem;
+}
+
 @media (max-width: 480px) {
   .card-line-color {
     flex-wrap: wrap;
   }
 
-  .card-line-color img {
+  .card-line-color .card-image {
+    width: 100%;
+  }
+
+  .card-line-color .card-text {
     width: 100%;
   }
 }
@@ -92,11 +99,14 @@
   background-color: #a0b1280f;
 }
 
+.card-block .card-image {
+  height: 12rem;
+}
+
 .card-block img {
   width: 100%;
   height: 100%;
   object-fit: cover;
-  opacity: 0.5;
 }
 
 .card-block .card-text {
@@ -136,7 +146,6 @@
   width: 10rem;
   height: 10rem;
   object-fit: cover;
-  opacity: 0.5;
 }
 
 .card-news-text .card-news-title {
@@ -200,7 +209,6 @@
   width: 10rem;
   height: 10rem;
   object-fit: cover;
-  opacity: 0.5;
 }
 
 .card-event-text .card-event-date {

theme/clms/css/home.css

@@ -87,7 +87,7 @@
 
 .home-carousel .ccl-banner-top-main {
   padding: 4rem 2rem;
-  background-position: 50%;
+  background-position: center;
   background-repeat: no-repeat;
   background-size: cover;
 }
@@ -280,33 +280,28 @@
 
 /* Map band */
 .home-map-container {
-  padding: 4rem 1rem;
+  padding: 4rem 2rem;
   background: url(../img/home-map-background.jpg) no-repeat center;
   background-size: cover;
 }
+@media (max-width: 480px) {
+  .home-map-container {
+    padding: 2rem 1rem;
+  }
+}
 
 .home-map-banner {
-  width: 100%;
+  max-width: 100%;
   padding: 1.5rem;
   background-color: #ffffffb3;
 }
 
 .home-map-banner h4 {
   margin-bottom: 1rem;
 }
-@media (min-width: 576px) {
-  .home-map-banner {
-    width: 80%;
-  }
-}
 @media (min-width: 768px) {
   .home-map-banner {
-    width: 60%;
-  }
-}
-@media (min-width: 1200px) {
-  .home-map-banner {
-    width: 40%;
+    max-width: 60%;
   }
 }
 
@@ -317,9 +312,6 @@
 
 /* News/events band */
 .home-news-events-block {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
   padding: 3rem 1rem;
   background-color: #a0b1280f;
 }

theme/clms/css/maps.css

@@ -455,7 +455,8 @@
 	font-size: 1rem;
 }
 
-.land .active-layer-options i:hover {
+.land .active-layer-options i:hover,
+.land .active-layer-options svg:hover {
 	color: #7c8921;
 }
 

theme/clms/css/maps.less

@@ -460,7 +460,8 @@
     font-size: 1rem;
   }
 
-  .active-layer-options i:hover {
+  .active-layer-options i:hover,
+  .active-layer-options svg:hover {
     color: #7c8921;
   }