Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner

products/ASC.Files/Client/src/components/Badges.js

@@ -142,7 +142,7 @@ const Badges = ({
           size={sizeBadge}
           onClick={onFilesClick}
           hoverColor={theme.filesBadges.hoverIconColor}
-          title={t("Common:EditButton")}
+          title={isForm ? t("Common:FillFormButton") : t("Common:EditButton")}
         />
       )}
       {canConvert && !isTrashFolder && (

products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js

@@ -66,8 +66,16 @@ const StyledTile = styled.div`
     (props.checked || props.isActive) &&
     checkedStyle}
 
+${(props) =>
+    !props.isDragging &&
+    !isMobile &&
+    css`
+      :hover {
+        ${checkedStyle}
+      }
+    `}
 
-  &:before, 
+  &:before,
   &:after {
     ${(props) =>
       props.isFolder &&
@@ -432,6 +440,7 @@ class Tile extends React.PureComponent {
         {...this.props}
         onContextMenu={onContextMenu}
         dragging={dragging && isFolder}
+        isDragging={dragging}
         isFolder={(isFolder && !fileExst) || (!fileExst && id === -1)}
         isRecycleBin={isRecycleBin}
         checked={checked}