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

Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner

Browse Source
This commit is contained in:
Viktor Fomin 2022-05-26 10:27:31 +03:00
commit cdf2acf313
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
products/ASC.Files/Client/src/components/dialogs/ConflictResolveDialog/index.js
View File

@ -19,14 +19,14 @@ const StyledModalDialog = styled(ModalDialog)`
} }
.conflict-resolve-radio-button { .conflict-resolve-radio-button {
label{ label {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
svg { svg {
overflow: visible; overflow: visible;
margin-right: 8px; margin-right: 8px;
margin-top: 3px margin-top: 3px;
} }
} }
@ -40,14 +40,23 @@ const StyledModalDialog = styled(ModalDialog)`
.button-dialog-accept { .button-dialog-accept {
margin-right: 8px; margin-right: 8px;
} }
.modal-dialog-aside-footer, .modal-dialog-modal-footer {
.modal-dialog-aside-footer {
border-top: ${(props) => props.theme.button.border.baseDisabled}; border-top: ${(props) => props.theme.button.border.baseDisabled};
margin-left: -16px; margin-left: -16px;
margin-right: -16px; margin-right: -16px;
padding-left: 16px; padding-left: 16px;
padding-right: 16px; padding-right: 16px;
padding-top: 16px; padding-top: 16px;
} }
.modal-dialog-modal-footer {
border-top: ${(props) => props.theme.button.border.baseDisabled};
margin-left: -12px;
margin-right: -12px;
padding-left: 12px;
padding-right: 12px;
padding-top: 12px;
} }
`; `;