Merge branch '11.x.x' into draftjs-link-color

RedTurtle · Dec 13, 2024 · 5c0d07a · 5c0d07a
2 parents 653fe34 + 14af83d
commit 5c0d07a
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 
 
+## [11.25.3](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.25.2...v11.25.3) (2024-12-12)
+
+
+### Bug Fixes
+
+* translations ([6c2379b](https://github.com/RedTurtle/design-comuni-plone-theme/commit/6c2379b8a263ecbc6b69695788e82d9c1deba272))
+
+
+### Documentation
+
+* updated publiccode and release log ([10abdae](https://github.com/RedTurtle/design-comuni-plone-theme/commit/10abdae4068ea883640769c48df06337b6478b99))
+
 ## [11.25.2](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.25.1...v11.25.2) (2024-11-28)
 
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -55,6 +55,12 @@
 
 - Colore del font del bottone DraftJS nell'editor sistemato a bianco.
 
+## Versione 11.25.3 (12/12/2024)
+
+### Migliorie
+
+- Aggiornate diverse traduzioni italiane.
+
 ## Versione 11.25.1 (28/11/2024)
 
 ### Fix

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "design-comuni-plone-theme",
   "description": "Volto Theme for Italia design guidelines",
   "license": "GPL-v3",
-  "version": "11.25.2",
+  "version": "11.25.3",
   "main": "src/index.js",
   "repository": {
     "type": "git",
@@ -200,7 +200,7 @@
     "stylelint-prettier": "4.0.2"
   },
   "peerDependencies": {
-    "@plone/volto": "17.19.0"
+    "@plone/volto": "17.20.2"
   },
   "packageManager": "[email protected]"
 }
diff --git a/publiccode.yml b/publiccode.yml
@@ -227,9 +227,9 @@ maintenance:
 name: io-Comune - Il sito AgID per Comuni ed Enti Pubblici
 platforms:
   - web
-releaseDate: '2024-11-28'
+releaseDate: '2024-12-12'
 softwareType: standalone/web
-softwareVersion: 11.25.2
+softwareVersion: 11.25.3
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

diff --git a/src/config/italiaConfig.js b/src/config/italiaConfig.js
@@ -189,7 +189,7 @@ export default function applyConfig(voltoConfig) {
       ...(config.settings.controlpanels ?? []),
       {
         '@id': '/release-log',
-        group: 'Generali',
+        group: 'General',
         title: 'Novità ultimi rilasci',
         id: 'release-log',
       },

diff --git a/src/theme/_cms-ui.scss b/src/theme/_cms-ui.scss
@@ -471,6 +471,14 @@ body.cms-ui {
   }
 
   &.section-controlpanel {
+    .grid > .row {
+      // HIDE TAXONOMIES CONTROLPANEL UNTIL #62343 IS DONE
+      > .column:has([href='/controlpanel/taxonomies']),
+      > .column:has([href='/controlpanel/volto-settings']) {
+        display: none;
+      }
+    }
+
     a {
       text-decoration: none;
 
@@ -484,6 +492,18 @@ body.cms-ui {
         display: none;
       }
     }
+    // Hide the help text in the configuration widgets
+    // TODO this is a temporary fix, a release needs to be made on every add-on to fix this
+    .footer-configuration-widget .stretched.twelve.wide.column:has(p.help),
+    .slimheader-configuration-widget
+      .wrapper:has(label[for='menu-configuration']),
+    .subfooter-configuration-widget
+      .wrapper:has(label[for='menu-configuration']),
+    .secondary-menu-configuration-widget
+      .wrapper:has(label[for='menu-configuration']),
+    .menu-configuration-widget .wrapper:has(label[for='menu-configuration']) {
+      display: none !important;
+    }
   }
 
   [data-rbd-draggable-context-id] {

diff --git a/yarn.lock b/yarn.lock
@@ -8232,7 +8232,7 @@ __metadata:
     volto-venue: 4.1.0
     webpack-image-resize-loader: ^5.0.0
   peerDependencies:
-    "@plone/volto": 17.19.0
+    "@plone/volto": 17.20.2
   languageName: unknown
   linkType: soft