IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into bugfix/fixed-dates-in-profile

Browse Source
This commit is contained in:
Nikita Gopienko 2022-02-25 17:51:06 +03:00 committed by GitHub
commit cae358636e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
products/ASC.Files/Client/src/components/EditingWrapperComponent.js
View File

@ -89,6 +89,8 @@ const EditingWrapper = styled.div`
display: flex; display: flex;
align-items: center; align-items: center;
`} `}
${(props) => props.viewAs === "table" && `padding-left: 12px`}
} }
.edit-button { .edit-button {
@ -141,6 +143,7 @@ const EditingWrapper = styled.div`
.is-edit { .is-edit {
/* margin-top: 4px; */ /* margin-top: 4px; */
${(props) => props.viewAs === "table" && `padding-left: 4px;`}
} }
`; `;

2
products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js
View File

@ -73,7 +73,7 @@ const StyledSimpleFilesRow = styled(Row)`
} }
.row_content { .row_content {
max-width: fit-content; ${(props) => props.sectionWidth > 500 && `max-width: fit-content;`}
min-width: auto; min-width: auto;
} }

2
products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
View File

@ -68,7 +68,7 @@ const InfoItemValue = styled.div`
margin-top: 6px; margin-top: 6px;
} }
@media (max-width: 1024px) { @media (max-width: 1024px) {
padding: 6px 24px 8px 8px; padding: 6px 8px 8px 8px;
margin-left: -8px; margin-left: -8px;
} }
} }

2
web/ASC.Web.Client/src/components/Main/index.js
View File

@ -24,8 +24,10 @@ const StyledMain = styled.main`
`; `;
const Main = React.memo((props) => { const Main = React.memo((props) => {
if (isIOS && !isFirefox) {
const vh = (window.innerHeight - 57) * 0.01; const vh = (window.innerHeight - 57) * 0.01;
document.documentElement.style.setProperty("--vh", `${vh}px`); document.documentElement.style.setProperty("--vh", `${vh}px`);
}
//console.log("Main render"); //console.log("Main render");
return <StyledMain className="main" {...props} />; return <StyledMain className="main" {...props} />;
}); });