Web: Files: Fixed styles for version history panel.

ONLYOFFICE · Nov 3, 2021 · e2c435d · e2c435d
1 parent 76b4251
commit e2c435d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/StyledVersionRow.js b/products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/StyledVersionRow.js
@@ -12,6 +12,7 @@ const StyledVersionRow = styled(Row)`
   .row_content {
     position: relative;
     padding-top: 14px;
+    ${(props) => !props.isTabletView && "padding-right:16px"}
   }
 
   .version_badge {

diff --git a/products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js b/products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/VersionRow.js
@@ -33,6 +33,7 @@ const VersionRow = (props) => {
     updateCommentVersion,
     onSetRestoreProcess,
     isRestoreProcess,
+    isTabletView,
   } = props;
   const [showEditPanel, setShowEditPanel] = useState(false);
   const [commentValue, setCommentValue] = useState(info.comment);
@@ -67,7 +68,6 @@ const VersionRow = (props) => {
   const onOpenFile = () => window.open(info.webUrl);
 
   const onRestoreClick = () => {
-
     onSetRestoreProcess(true);
     restoreVersion(info.id, info.version)
       .catch((err) => toastr.error(err))
@@ -104,6 +104,7 @@ const VersionRow = (props) => {
       canEdit={canEdit}
       isRestoreProcess={isRestoreProcess}
       isVersion={isVersion}
+      isTabletView={isTabletView}
     >
       <>
         <Box displayProp="flex">
@@ -249,7 +250,7 @@ const VersionRow = (props) => {
 
 export default inject(({ auth, versionHistoryStore }) => {
   const { user } = auth.userStore;
-  const { culture } = auth.settingsStore;
+  const { culture, isTabletView } = auth.settingsStore;
   const language = (user && user.cultureName) || culture || "en-US";
 
   const {
@@ -260,7 +261,7 @@ export default inject(({ auth, versionHistoryStore }) => {
 
   return {
     culture: language,
-
+    isTabletView,
     markAsVersion,
     restoreVersion,
     updateCommentVersion,

diff --git a/products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/index.js b/products/ASC.Files/Client/src/pages/VersionHistory/Section/Body/index.js
@@ -68,7 +68,9 @@ class SectionBodyContent extends React.Component {
         </RowContainer>
       </div>
     ) : (
-      <Loaders.HistoryRows title="version-history-body-loader" />
+      <div className="loader-history-rows" style={{ paddingRight: "16px" }}>
+        <Loaders.HistoryRows title="version-history-body-loader" />
+      </div>
     );
   }
 }

diff --git a/products/ASC.Files/Client/src/pages/VersionHistory/index.js b/products/ASC.Files/Client/src/pages/VersionHistory/index.js
@@ -51,6 +51,7 @@ class PureVersionHistory extends React.Component {
         secondaryProgressBarIcon="file"
         showSecondaryButtonAlert={false}
         withBodyScroll={false}
+        isLoadingContent={isLoading}
       >
         <PageLayout.ArticleHeader>
           <ArticleHeaderContent />