diff --git a/packages/asc-web-components/drop-down-item/styled-drop-down-item.js b/packages/asc-web-components/drop-down-item/styled-drop-down-item.js index 27f23965b0..caf835cd27 100644 --- a/packages/asc-web-components/drop-down-item/styled-drop-down-item.js +++ b/packages/asc-web-components/drop-down-item/styled-drop-down-item.js @@ -119,7 +119,7 @@ const StyledDropdownItem = styled.div` props.isActive && css` background-color: ${(props) => - props.theme.dropDownItem.hoverBackgroundColor}; + props.theme.dropDownItem.hoverBackgroundColor} !important; `} `; StyledDropdownItem.defaultProps = { theme: Base }; diff --git a/packages/asc-web-components/drop-down/index.js b/packages/asc-web-components/drop-down/index.js index b907f6db5b..93fa8d221a 100644 --- a/packages/asc-web-components/drop-down/index.js +++ b/packages/asc-web-components/drop-down/index.js @@ -297,7 +297,7 @@ class DropDownContainer extends React.Component { }; render() { const { withBackdrop = true, withBlur = false, open } = this.props; - const eventTypesProp = isMobile ? { eventTypes: ["touchend"] } : {}; + const eventTypesProp = isMobile ? { eventTypes: ["click"] } : {}; return ( <> diff --git a/packages/asc-web-components/main-button-mobile/index.js b/packages/asc-web-components/main-button-mobile/index.js index f2e2d466d8..131a9f98fd 100644 --- a/packages/asc-web-components/main-button-mobile/index.js +++ b/packages/asc-web-components/main-button-mobile/index.js @@ -267,7 +267,7 @@ const MainButtonMobile = (props) => { { {pageItems && ( + + diff --git a/products/ASC.Files/Client/public/images/form.gallery.react.svg b/products/ASC.Files/Client/public/images/form.gallery.react.svg new file mode 100644 index 0000000000..4ad2da197f --- /dev/null +++ b/products/ASC.Files/Client/public/images/form.gallery.react.svg @@ -0,0 +1,3 @@ + + + diff --git a/products/ASC.Files/Client/public/locales/it/Translations.json b/products/ASC.Files/Client/public/locales/it/Translations.json index 65ff41c96e..2e0c3d4e4b 100644 --- a/products/ASC.Files/Client/public/locales/it/Translations.json +++ b/products/ASC.Files/Client/public/locales/it/Translations.json @@ -6,7 +6,7 @@ "ConnectingAccount": "Collegamento dell'account", "Copy": "Copiare", "CopyHere": "Copia qui", - "CreateMasterFormFromFile": "Crear plantilla de formulario desde archivo", + "CreateMasterFormFromFile": "Creare modello di modulo da file", "DeleteFromTrash": "Gli elementi selezionati sono stati eliminati dal Cestino con successo", "DeleteOperation": "Sta eliminando", "DeleteSelectedElem": "Gli elementi selezionati sono stati eliminati con successo", @@ -39,12 +39,12 @@ "MoveHere": "Sposta qui", "MoveToOperation": "Sta spostando", "NewForm": "Modello di modulo", - "NewFormFile": "Formulario desde archivo de texto", + "NewFormFile": "Modulo da file di testo", "OwnerChange": "Cambiare proprietario", "Presentations": "Presentazioni", "Spreadsheets": "Fogli di calcolo", "SubNewForm": "En blanco", - "SubNewFormFile": "Desde archivo de texto", + "SubNewFormFile": "Da file di testo", "ThirdPartyInfo": "Cambiare le informazioni di terze parti", "TitleShowActions": "Mostra azioni con file", "TitleShowFolderActions": "Mostra azioni con cartelle", diff --git a/products/ASC.Files/Client/src/components/Article/MainButton/index.js b/products/ASC.Files/Client/src/components/Article/MainButton/index.js index aa78a35f07..023f6edd7c 100644 --- a/products/ASC.Files/Client/src/components/Article/MainButton/index.js +++ b/products/ASC.Files/Client/src/components/Article/MainButton/index.js @@ -124,12 +124,11 @@ const ArticleMainButtonContent = (props) => { items: [ { className: "main-button_drop-down_sub", - icon: "images/form.react.svg", + icon: "images/form.blank.react.svg", label: t("Translations:SubNewForm"), onClick: onCreate, action: "docxf", key: "docxf", - withoutIcon: true, }, { className: "main-button_drop-down_sub", @@ -138,16 +137,14 @@ const ArticleMainButtonContent = (props) => { onClick: onShowSelectFileDialog, disabled: isPrivacy, key: "form-file", - withoutIcon: true, }, { className: "main-button_drop-down_sub", - icon: "images/form.react.svg", + icon: "images/form.gallery.react.svg", label: t("Common:OFORMsGallery"), onClick: onShowGallery, disabled: isPrivacy, key: "form-gallery", - withoutIcon: true, }, ], }, diff --git a/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js b/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js index 37f36d91ab..b1cc63fa15 100644 --- a/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js +++ b/products/ASC.Files/Client/src/pages/Home/Section/Header/index.js @@ -114,22 +114,22 @@ class SectionHeaderContent extends React.Component { { key: "new-form", label: t("Translations:SubNewForm"), - icon: "images/form.react.svg", + icon: "images/form.blank.react.svg", onClick: this.createForm, }, { key: "new-form-file", label: t("Translations:SubNewFormFile"), + icon: "images/form.file.react.svg", onClick: this.createFormFromFile, disabled: isPrivacyFolder, - icon: "images/form.file.react.svg", }, { key: "oforms-gallery", label: t("Common:OFORMsGallery"), + icon: "images/form.gallery.react.svg", onClick: this.onShowGallery, disabled: isPrivacyFolder || (isMobile && isTablet), - icon: "images/form.react.svg", }, ], }, diff --git a/products/ASC.Files/Client/src/store/FilesActionsStore.js b/products/ASC.Files/Client/src/store/FilesActionsStore.js index 44f2e0126d..e8415ac7b2 100644 --- a/products/ASC.Files/Client/src/store/FilesActionsStore.js +++ b/products/ASC.Files/Client/src/store/FilesActionsStore.js @@ -490,10 +490,13 @@ class FilesActionStore { }); setIsLoading(false); type === FileAction.Rename && - this.onSelectItem({ - id: selectedItem.id, - isFolder: selectedItem.isFolder, - }); + this.onSelectItem( + { + id: selectedItem.id, + isFolder: selectedItem.isFolder, + }, + false + ); } };