Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0
This commit is contained in:
commit
01541bf452
@ -249,6 +249,7 @@ const PeopleTableRow = (props) => {
|
||||
size="content"
|
||||
displaySelectedOption
|
||||
modernView
|
||||
manualWidth={"fit-content"}
|
||||
/>
|
||||
);
|
||||
|
||||
|
@ -113,6 +113,7 @@ const Accounts = ({
|
||||
size="content"
|
||||
displaySelectedOption
|
||||
modernView
|
||||
manualWidth={"fit-content"}
|
||||
/>
|
||||
);
|
||||
|
||||
|
@ -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>
|
||||
)}
|
||||
|
@ -201,7 +201,7 @@ const StyledTile = styled.div`
|
||||
margin-right: 14px;
|
||||
}
|
||||
|
||||
:hover {
|
||||
.file-icon_container:hover {
|
||||
${(props) =>
|
||||
!props.dragging &&
|
||||
!props.inProgress &&
|
||||
|
Loading…
Reference in New Issue
Block a user