Skip to content

Commit

Permalink
Merge branch 'main' into us_59721_file_upload_restraint_message_in_mo…
Browse files Browse the repository at this point in the history
…dal_main
  • Loading branch information
deodorhunter authored Nov 21, 2024
2 parents cd833d5 + 928d4f7 commit 3762f7b
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 7 deletions.
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Changelog

## [12.0.0-alpha.25](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v12.0.0-alpha.24...v12.0.0-alpha.25) (2024-11-07)


### Features

* show end of recurrence date instead of end date in event ct when set ([#789](https://github.com/RedTurtle/design-comuni-plone-theme/issues/789)) ([18c900a](https://github.com/RedTurtle/design-comuni-plone-theme/commit/18c900aa92325b95fc27cce3e0e42e8878ee8fde))


### Bug Fixes

* arlogin styles in 992px-1200px media query space ([#802](https://github.com/RedTurtle/design-comuni-plone-theme/issues/802)) ([a909372](https://github.com/RedTurtle/design-comuni-plone-theme/commit/a909372af462968b2880133d47760b37bbcba032))
* page freeze when updateSideMenuOnLoadingBlocks=true and page has gallery ([#805](https://github.com/RedTurtle/design-comuni-plone-theme/issues/805)) ([e210bee](https://github.com/RedTurtle/design-comuni-plone-theme/commit/e210bee91a092b6da098aefac6e902db672e24ec))


### Documentation

* update docs link in publiccode.yml ([#190](https://github.com/RedTurtle/design-comuni-plone-theme/issues/190)) ([82f9d0f](https://github.com/RedTurtle/design-comuni-plone-theme/commit/82f9d0f00274efeb3c95cb8e5c3e1aa26859e487))

## [12.0.0-alpha.24](https://github.com/RedTurtle/design-comuni-plone-theme/compare/v12.0.0-alpha.23...v12.0.0-alpha.24) (2024-10-24)


Expand Down
8 changes: 7 additions & 1 deletion RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,13 @@
### Fix
- ...
-->
-->

## Versione X.X.X (dd/mm/yyyy)

### Fix

- Risolto un problema di visualizzazione grafica per il bottone di login all'area personale per alcune specifiche dimensioni di schermi

## Versione X.X.X (dd/mm/yyyy)

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "design-comuni-plone-theme",
"description": "Volto Theme for Italia design guidelines",
"license": "GPL-v3",
"version": "12.0.0-alpha.24",
"version": "12.0.0-alpha.25",
"main": "src/index.js",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion publiccode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ logo: docs/logo-io-comune.png
description:
it:
documentation: |-
https://docs.google.com/document/d/1SThuxa_ah0BuNXukWs564kKPfprK41WLQE8Mome-0xg/
https://docs.google.com/document/d/1BrlGYmE3Z4y6FMIrfBJWOX1P2JVEGzJZS6TRbeIiFSk/edit?tab=t.0
features:
- PNRR
- PNRR/Misura/1.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Button } from 'design-react-kit';
const LoginButton = ({ children, baseLoginUrl, size = 'full' }) => {
return baseLoginUrl ? (
<Button
className="btn-icon"
className="btn-icon login-button"
color="primary"
href={baseLoginUrl}
icon={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => {

const wholeDay = content?.whole_day;
const openEnd = content?.open_end;

// show only start when event starts and ends in same day or if a recurrence is set
// because to set a recurrence, the event must have the same date as start and end date
const renderOnlyStart =
Expand All @@ -65,6 +64,7 @@ const PageHeaderEventDates = ({ content, moment, rrule }) => {
RRULE_LANGUAGE.strings['on the'] = 'la';
}
}

return RRULE_LANGUAGE.strings[t];
},
RRULE_LANGUAGE,
Expand Down
3 changes: 1 addition & 2 deletions src/components/ItaliaTheme/View/ViewUtils.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@ export const useSideMenu = (content, documentBody) => {
}
if (observer) {
observer.observe(documentBody.current, {
//attributes: true,
childList: true,
subtree: true,
//subtree: true, //commentato, perchè a noi interessano solo i figli di primo livello. Con questo abilitato, se in pagina ci sono delle gallery si impalla il browser
});
}
return () => {
Expand Down
10 changes: 10 additions & 0 deletions src/theme/ItaliaTheme/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -369,3 +369,13 @@ iframe {
}
}
}

.public-ui
.it-header-slim-wrapper
.it-header-slim-wrapper-content
.it-header-slim-right-zone.header-slim-right-zone
.login-button {
@media (min-width: #{map-get($grid-breakpoints, md)}) and (max-width:#{map-get($grid-breakpoints, xl)}) {
flex: unset;
}
}

0 comments on commit 3762f7b

Please sign in to comment.