Merge pull request #560 from eea/develop

Develop
eea · Mar 12, 2024 · 2171387 · 2171387
2 parents c0b166b + 5d501e8
commit 2171387
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,11 +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).
 
-### [1.1.120](https://github.com/eea/volto-clms-theme/compare/1.1.119...1.1.120) - 8 March 2024
+### [1.1.121](https://github.com/eea/volto-clms-theme/compare/1.1.120...1.1.121) - 12 March 2024
 
-#### :hammer_and_wrench: Others
+#### :bug: Bug Fixes
+
+- fix:CLMS-3092 [Unai Etxaburu - [`29efbc1`](https://github.com/eea/volto-clms-theme/commit/29efbc17c76c50b6e6c8a78b80716df820930f49)]
+- fix: CLMS-3110 small style changes in edit mode [Unai Etxaburu - [`7f3c4cb`](https://github.com/eea/volto-clms-theme/commit/7f3c4cb05c797827cd32b5e1e0e79667892b8f67)]
+
+### [1.1.120](https://github.com/eea/volto-clms-theme/compare/1.1.119...1.1.120) - 8 March 2024
 
-- fix block chooser in edit mode [Unai Etxaburu - [`d994993`](https://github.com/eea/volto-clms-theme/commit/d9949932b1a74130f49580e35f237267758ad46c)]
 ### [1.1.119](https://github.com/eea/volto-clms-theme/compare/1.1.118...1.1.119) - 28 February 2024
 
 #### :hammer_and_wrench: Others

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.120",
+  "version": "1.1.121",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

diff --git a/src/components/CLMSDownloadCartView/CLMSCartContent.jsx b/src/components/CLMSDownloadCartView/CLMSCartContent.jsx
@@ -195,7 +195,7 @@ const CLMSCartContent = (props) => {
         />,
       );
     }
-  }, [downloadtool_state]);
+  }, [downloadtool_state.requested, downloadtool_state.error]);
 
   const startDownloading = () => {
     setLoadingTable(true);

diff --git a/theme/site/extras/menu.less b/theme/site/extras/menu.less
@@ -276,9 +276,9 @@
 
 .block.search .search-wrapper .ui.input > input {
   height: 2.5rem;
+  padding: 0.5rem 1rem !important;
   border: 1px solid #dadada;
   border-radius: 0;
-  padding: 0.5rem 1rem !important;
 }
 
 .block.search .search-wrapper .ui.input > input:focus-visible {
@@ -356,14 +356,15 @@
 
 .search-filters {
   display: flex;
-  justify-content: space-between;
   align-items: center;
+  justify-content: space-between;
 }
 
 @media (max-width: 576px) {
   .search-filters {
     flex-direction: column;
   }
+
   .block.search .search-results-count-sort .search-details {
     width: 100%;
   }
@@ -413,25 +414,25 @@
 
 /* Filters modal */
 .modal-filters {
-  display: none;
   position: fixed;
+  z-index: 10000;
   top: 0;
   bottom: 0;
+  display: none;
   width: 100%;
-  z-index: 10000;
 }
 
 .modal-filters-background {
-  height: 100vh;
   display: flex;
-  justify-content: flex-end;
   overflow: auto;
+  height: 100vh;
+  justify-content: flex-end;
 }
 
 .modal-filters-container {
   display: flex;
-  flex-direction: column;
   width: 100%;
+  flex-direction: column;
   background: white;
 }
 @media (min-width: 576px) {
@@ -452,8 +453,8 @@
 
 .modal-filters-header {
   display: flex;
-  justify-content: space-between;
   align-items: center;
+  justify-content: space-between;
   padding: 1rem;
   border-bottom: solid 1px @clmsGreen;
 }
@@ -469,13 +470,13 @@
 }
 
 .modal-filters-clear {
-  text-decoration: underline;
-  font-size: 0.85rem;
   padding-right: 1rem;
-  margin-right: 1rem;
   border-right: solid 1px #273b4b;
-  line-height: 1.5rem;
+  margin-right: 1rem;
   cursor: pointer;
+  font-size: 0.85rem;
+  line-height: 1.5rem;
+  text-decoration: underline;
 }
 
 .modal-filters-close {
@@ -509,29 +510,29 @@
 }
 
 .modal-filters-dropdown .ccl-expandable__button {
-  background-color: white;
-  color: #212529;
-  border-bottom: solid 1px @clmsGreen;
+  position: relative;
   display: -webkit-flex;
   display: flex;
   align-items: center;
+  padding: 1rem 1.5rem;
+  border-bottom: solid 1px @clmsGreen;
+  margin: 0;
+  background-color: white;
+  color: #212529;
+  cursor: pointer;
   font-size: 1rem;
   font-weight: bold;
-  position: relative;
   text-decoration: none;
-  margin: 0;
-  padding: 1rem 1.5rem;
-  cursor: pointer;
 }
 
 .modal-filters-dropdown .ccl-expandable__button::after {
-  font-family: 'ccl-icons';
-  color: @clmsGreen;
+  position: absolute;
+  right: 0;
   margin-right: 1.5rem;
+  color: @clmsGreen;
+  font-family: 'ccl-icons';
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
-  position: absolute;
-  right: 0;
   -webkit-transition: all 0.3s ease-in-out;
   transition: all 0.3s ease-in-out;
 }
@@ -579,13 +580,13 @@
   .ccl-expandable__button
   + .ccl-form
   .ccl-expandable__button {
-  background-color: transparent;
-  margin: 0;
   padding: 0;
-  font-weight: normal;
   border: none;
-  font-size: 1rem;
+  margin: 0;
   margin-top: 1.66rem;
+  background-color: transparent;
+  font-size: 1rem;
+  font-weight: normal;
 }
 
 .modal-filters-dropdown
@@ -607,11 +608,11 @@
 }
 
 .modal-filters-dropdown .filters-tag-container {
-  padding: 0.5rem 1.5rem 1rem 1.5rem;
   display: grid;
+  align-items: center;
+  padding: 0.5rem 1.5rem 1rem 1.5rem;
   grid-gap: 0.5rem;
   grid-template-columns: auto auto auto;
-  align-items: center;
 }
 
 .modal-filters-dropdown .filters-tag input {
@@ -623,8 +624,8 @@
 }
 
 .modal-filters-dropdown .filters-tag .checkbox input:checked + label {
-  color: white;
   background: @clmsGreen;
+  color: white;
   -webkit-transition: all 0.3s ease-out;
   transition: all 0.3s ease-out;
 }
@@ -645,23 +646,26 @@
 }
 
 .modal-filters-dropdown .filters-tag .checkbox label:hover {
-  color: white;
   background: @clmsGreen;
+  color: white;
 }
 
 .modal-filters-dropdown .filters-tag .ui.checkbox label:before,
 .modal-filters-dropdown .filters-tag .ui.checkbox input:checked ~ label:after {
   content: none;
 }
+
 .modal-filters-dropdown .ui.checkbox label:before {
   border: 1px solid #404040;
   border-radius: 2px;
   box-shadow: none;
 }
+
 .modal-filters-dropdown .ui.checkbox input:checked ~ label:after,
 .modal-filters-dropdown .ui.checkbox input:checked:focus ~ label:after {
   color: @clmsGreen;
 }
+
 .modal-filters-dropdown .ui.checkbox input:checked ~ label:before,
 .modal-filters-dropdown .ui.checkbox input:checked:focus ~ label:before {
   border: 1px solid @clmsGreen;
@@ -750,3 +754,19 @@ main .search-form button {
   background-color: #212529;
   color: white;
 }
+
+//tab block z-index
+.tabs-block > .styled > .tabs > .ui.grid > .column > .ui.menu.right,
+.tabs-block > .styled > .tabs > .ui.menu.right,
+.tabs-block > .tabs > .ui.grid > .column > .ui.menu.right,
+.tabs-block > .tabs > .ui.menu.right {
+  margin-bottom: 1.5rem;
+}
+
+.tabs-block .block-toolbar {
+  margin-top: -4rem;
+}
+
+// .text-slate-editor-inner {
+//   z-index: 2 !important;
+// }
diff --git a/theme/site/extras/volto-block-style-override.less b/theme/site/extras/volto-block-style-override.less
@@ -404,6 +404,6 @@ body:not(.is-authenticated):not(.document_wide_view).stretch {
 
 // edit mode block chooser
 .tabs-block .blocks-chooser {
-  margin-top: 1rem !important;
+  margin-top: 2rem !important;
   transform: none !important;
 }