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

Merge branch 'feature/workspaces' of github.com:ONLYOFFICE/AppServer into feature/workspaces

Browse Source
This commit is contained in:
Vladislav Makhov 2021-03-18 17:47:44 +03:00
commit 12dc227d03
9 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/asc-web-components/combobox/sub-components/styled-combobutton.js
View File

@ -130,7 +130,7 @@ const StyledOptionalItem = styled.div`
StyledOptionalItem.defaultProps = { theme: Base };
const StyledIcon = styled.div`
margin: ${(props) => props.theme.comboBox.childrenButton.margin};
margin-right: ${(props) => props.theme.comboBox.childrenButton.marginRight};
width: ${(props) => props.theme.comboBox.childrenButton.width};
height: ${(props) => props.theme.comboBox.childrenButton.height};

10
packages/asc-web-components/drop-down-item/styled-drop-down-item.js
View File

@ -86,12 +86,12 @@ const StyledDropdownItem = styled.div`
${(props) =>
props.isHeader &&
`
${disabledAndHeaderStyle}
css`
${disabledAndHeaderStyle}
text-transform: uppercase;
break-before: column;
`}
text-transform: uppercase;
break-before: column;
`}
@media ${tablet} {
line-height: ${(props) => props.theme.dropDownItem.tabletLineHeight};

1
packages/asc-web-components/themes/base.js
View File

@ -1405,7 +1405,6 @@ const Base = {
childrenButton: {
marginRight: "8px",
margin: "-6px 8px 0px 0px",
width: "16px",
height: "16px",

1
packages/asc-web-components/themes/dark.js
View File

@ -1192,7 +1192,6 @@ const Dark = {
childrenButton: {
marginRight: "8px",
margin: "-6px 8px 0px 0px",
width: "16px",
height: "16px",

4
products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContent.js
View File

@ -59,14 +59,14 @@ const StyledFileActionsConvertEditDocIcon = styled(
)`
${commonIconsStyles}
path {
fill: "#3B72A7";
fill: #3b72a7;
}
`;
const StyledFileActionsLockedIcon = styled(FileActionsLockedIcon)`
${commonIconsStyles}
path {
fill: "#3B72A7";
fill: #3b72a7;
}
`;
const SimpleFilesRowContent = styled(RowContent)`

2
products/ASC.Files/Client/src/i18n.js
View File

@ -32,7 +32,7 @@ newInstance.use(Backend).init({
},
react: {
useSuspense: true,
useSuspense: false,
},
});

4
products/ASC.People/Client/src/pages/Home/Section/Body/userContent.js
View File

@ -16,13 +16,13 @@ import CatalogSpamIcon from "../../../../../public/images/catalog.spam.react.svg
const StyledSendClockIcon = styled(SendClockIcon)`
${commonIconsStyles}
path {
fill: "#3B72A7";
fill: #3b72a7;
}
`;
const StyledCatalogSpamIcon = styled(CatalogSpamIcon)`
${commonIconsStyles}
path {
fill: "#3B72A7";
fill: #3b72a7;
}
`;
const getFormattedGroups = (user, selectGroup) => {

1
web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
View File

@ -33,6 +33,7 @@ const Header = styled.header`
display: block;
font-size: 21px;
line-height: 0;
margin-top: -5px;
@media ${desktop} {
display: none;

10
web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
View File

@ -10,10 +10,8 @@ import PasswordInput from "@appserver/components/password-input";
import Loader from "@appserver/components/loader";
import toastr from "@appserver/components/toast/toastr";
import Heading from "@appserver/components/heading";
import PageLayout from "@appserver/common/components/PageLayout";
import { createPasswordHash, tryRedirectTo } from "@appserver/common/utils";
import { inject, observer } from "mobx-react";
const BodyStyle = styled.form`
@ -35,6 +33,12 @@ const BodyStyle = styled.form`
.password-button {
margin-top: 20px;
}
.password-input {
.password-field-wrapper {
width: 100%;
}
}
`;
class Form extends React.PureComponent {
@ -67,7 +71,6 @@ class Form extends React.PureComponent {
};
onSubmit = (e) => {
debugger;
this.setState({ isLoading: true }, function () {
const { userId, password, key } = this.state;
const {
@ -149,6 +152,7 @@ class Form extends React.PureComponent {
</Text>
<PasswordInput
id="password"
className="password-input"
name="password"
inputName="password"
inputValue={password}