Merge branch 'main' into slate

RedTurtle · Jan 15, 2024 · 2e584bf · 2e584bf
2 parents 603237d + 2a7d00d
commit 2e584bf
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,18 @@
 ## [11.0.0-alpha.2](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v11.0.0-alpha.1...v11.0.0-alpha.2) (2023-11-29)
 
+## [11.2.1](https://github.com/redturtle/design-comuni-plone-theme/compare/v11.2.0...v11.2.1) (2024-01-15)
+
+
+### Bug Fixes
+
+* callout style in draftJs ([#481](https://github.com/redturtle/design-comuni-plone-theme/issues/481)) ([34b8de7](https://github.com/redturtle/design-comuni-plone-theme/commit/34b8de7ead0c2639ddd131f2cbb530833546101e))
+* recurrence string and edit recurrence ([#482](https://github.com/redturtle/design-comuni-plone-theme/issues/482)) ([276cbef](https://github.com/redturtle/design-comuni-plone-theme/commit/276cbef5fea86942173e5ba556bbae2cc47bd7a1))
+
+
+### Documentation
+
+* updated publiccode and release log ([01eb885](https://github.com/redturtle/design-comuni-plone-theme/commit/01eb885524bcd54c21edfcdaf56a1a156bfea54a))
+
 ## [11.2.0](https://github.com/redturtle/design-comuni-plone-theme/compare/v11.1.4...v11.2.0) (2024-01-11)
 
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -60,6 +60,7 @@
 - Modificata l'altezza delle immagini delle card, per essere in linea con i template agid.
 ## Versione 11.1.4 (dd/mm/yyyy)
 ## Versione x.x.x (dd/mm/yyyy)
+## Versione 11.2.1 (15/01/2024)
 
 ### Migliorie
 
@@ -68,8 +69,9 @@
 ### Fix
 
 - Risolto un problema nell'edit della ricorrenza di un evento.
+- Risolto problema con lo stile "callout", icona megafono dell'editor di testo con sfondo bianco e bordo grigio
 
-## Versione 11.2.0 (11/01/2023)
+## Versione 11.2.0 (11/01/2024)
 
 ### Migliorie
 

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.2.0",
+  "version": "11.2.1",
   "main": "src/index.js",
   "keywords": [
     "volto-addon",

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-01-11'
+releaseDate: '2024-01-15'
 softwareType: standalone/web
-softwareVersion: 11.2.0
+softwareVersion: 11.2.1
 url: 'https://github.com/italia/design-comuni-plone-theme'
 usedBy:
   - ASP Comuni Modenesi Area Nord

diff --git a/src/theme/ItaliaTheme/_main.scss b/src/theme/ItaliaTheme/_main.scss
@@ -105,8 +105,16 @@ iframe {
     }
   }
 
-  .callout {
-    box-shadow: none; //override pastanaga styles
+  p.callout {
+    max-width: none;
+    border-left-width: 0.4rem;
+
+    p,
+    .public-DraftStyleDefault-block {
+      &:last-of-type {
+        margin-bottom: 0;
+      }
+    }
   }
 
   .text-larger {

diff --git a/src/theme/bootstrap-override/bootstrap-italia/_callout.scss b/src/theme/bootstrap-override/bootstrap-italia/_callout.scss
@@ -1,8 +1,8 @@
-.callout {
+div.callout {
+  max-width: none;
   padding: 0; //override volto's style
   border: none;
   border-radius: unset;
   margin: 0;
   box-shadow: none;
-  max-width: none;
 }