Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0

This commit is contained in:
Maksim Chegulov 2022-12-08 13:11:04 +03:00
commit 01541bf452
4 changed files with 7 additions and 2 deletions

View File

@ -249,6 +249,7 @@ const PeopleTableRow = (props) => {
size="content"
displaySelectedOption
modernView
manualWidth={"fit-content"}
/>
);

View File

@ -113,6 +113,7 @@ const Accounts = ({
size="content"
displaySelectedOption
modernView
manualWidth={"fit-content"}
/>
);

View File

@ -114,9 +114,12 @@ const User = ({
size="content"
modernView
title={t("Common:Role")}
manualWidth={"fit-content"}
/>
) : (
<div className="disabled-role-combobox" title={t("Common:Role")}>{userRole.label}</div>
<div className="disabled-role-combobox" title={t("Common:Role")}>
{userRole.label}
</div>
)}
</div>
)}

View File

@ -201,7 +201,7 @@ const StyledTile = styled.div`
margin-right: 14px;
}
:hover {
.file-icon_container:hover {
${(props) =>
!props.dragging &&
!props.inProgress &&