Merge branch 'hotfix/documents-bugfix' of github.com:ONLYOFFICE/AppServer into hotfix/documents-bugfix

products/ASC.Files/Client/src/components/pages/VersionHistory/Section/Body/VersionRow.js

@@ -158,6 +158,12 @@ const StyledRow = styled(Row)`
   .version_edit-comment-button-second {
     width: 87px;
   }
+  .version_modal-dialog > div > aside > div > div > div > div:first-child {
+    border-bottom: unset;
+  }
+  .version_modal-dialog > div > aside > div > div > div > div:nth-child(2) {
+    margin-top: -24px;
+  }
 `;
 
 const VersionRow = (props) => {
@@ -303,6 +309,7 @@ const VersionRow = (props) => {
                         style={{ margin: "8px 24px 8px 0" }}
                         //placeholder="Add comment"
                         onChange={onChange}
+                        heightTextArea={298}
                         value={commentValue}
                       />
                     </ModalDialog.Body>
@@ -310,7 +317,7 @@ const VersionRow = (props) => {
                       <Button
                         className="version_save-button"
                         label={t("AddButton")}
-                        size="medium"
+                        size="big"
                         primary
                         onClick={onSaveClick}
                       />

web/ASC.Web.Components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "asc-web-components",
-  "version": "1.0.476",
+  "version": "1.0.477",
   "description": "Ascensio System SIA component library",
   "license": "AGPL-3.0",
   "main": "dist/asc-web-components.js",

web/ASC.Web.Components/src/components/aside/aside.js

@@ -23,7 +23,7 @@ const StyledAside = styled(Container)`
     ${(props) => (props.visible ? "0" : props.scale ? "100%" : "320px")}
   );
   transition: transform 0.3s ease-in-out;
-  width: ${(props) => (props.scale ? "100%" : "320px")};
+  width: ${(props) => (props.scale ? "100%" : "325px")};
   z-index: ${(props) => props.zIndex};
   box-sizing: border-box;