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

Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore

Browse Source
This commit is contained in:
NikolayRechkin 2019-12-27 14:11:12 +03:00
commit e6fb0e18c7
10 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
products/ASC.People/Client/src/components/dialogs/ChangePasswordDialog/index.js
View File

@ -56,7 +56,7 @@ class ChangePasswordDialogComponent extends React.Component {
<Text fontSize='13px'>
<Trans i18nKey="MessageSendPasswordChangeInstructionsOnEmail" i18n={i18n}>
Send the password change instructions to the
<Link type="page" href={`mailto:${email}`} isHovered title={email}>
<Link type="page" href={`mailto:${email}`} noHover color='#316DAA' title={email}>
{{ email }}
</Link>
email address

2
products/ASC.People/Client/src/components/dialogs/DeleteSelfProfileDialog/index.js
View File

@ -54,7 +54,7 @@ class DeleteSelfProfileDialogComponent extends React.Component {
headerContent={t('DeleteProfileTitle')}
bodyContent={
<Text fontSize='13px'>
{t('DeleteProfileInfo')} <Link type="page" href={`mailto:${email}`} isHovered title={email}>
{t('DeleteProfileInfo')} <Link type="page" href={`mailto:${email}`} noHover color='#316DAA' title={email}>
{email}
</Link>
</Text>

7
products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js
View File

@ -124,7 +124,8 @@ class SectionBodyContent extends React.Component {
}
: {
key: GUID_EMPTY,
label: t("CustomAddEmployee", { typeUser })
label: t("CustomAddEmployee", { typeUser }),
default: true
}
};
@ -273,6 +274,7 @@ class SectionBodyContent extends React.Component {
name="group-name"
scale={true}
isAutoFocussed={true}
isBold={true}
tabIndex={1}
value={groupName}
onChange={this.onGroupChange}
@ -321,7 +323,8 @@ class SectionBodyContent extends React.Component {
isDisabled={inLoading}
selectedOption={{
key: 0,
label: t("AddMembers")
label: t("AddMembers"),
default: true
}}
scaled={true}
size="content"

7
products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/ContactsField.js
View File

@ -12,10 +12,6 @@ const Container = styled.div`
width: 120px;
margin: 0 8px 0 0;
}
.field-select > div > div:first-child.combo-button-label {
color: #A3A9AE;
}
`;
const getOptions = (patterns, keyPrefix) => {
@ -104,7 +100,8 @@ class ContactsField extends React.Component {
selectedOption={{
key: prefix,
label: addItemText,
value: ""
value: "",
default: true
}}
isDisabled={isDisabled}
scaled={true}

2
web/ASC.Web.Common/package.json
View File

@ -1,6 +1,6 @@
{
"name": "asc-web-common",
"version": "1.0.30",
"version": "1.0.32",
"description": "Ascensio System SIA common components and solutions library",
"license": "AGPL-3.0",
"files": [

6
web/ASC.Web.Common/src/components/AdvancedSelector/sub-components/StyledSelector.js
View File

@ -36,7 +36,7 @@ const dropdownStyles = css`
grid-row-gap: 16px;
grid-template-columns: 1fr;
grid-template-rows: 30px 0.98fr;
grid-template-rows: 30px 1fr;
grid-template-areas: "header-groups" "body-groups";
.header-groups {
@ -87,7 +87,6 @@ const StyledSelector = styled(Container)`
display: grid;
/* background-color: red; */
padding: 16px 16px 0 16px;
grid-row-gap: 16px;
grid-template-columns: 1fr;
grid-template-rows: ${props =>
@ -100,7 +99,7 @@ const StyledSelector = styled(Container)`
props.groups && props.groups.length > 0
? "70px"
: "30px"
: "30px"} 0.98fr;
: "30px"} 1fr;
grid-template-areas: "header-options" "body-options";
.header-options {
@ -154,6 +153,7 @@ const StyledSelector = styled(Container)`
.row-block {
padding-left: 8px;
margin-top: 8px;
.option-info {
position: absolute;

2
web/ASC.Web.Components/package.json
View File

@ -1,6 +1,6 @@
{
"name": "asc-web-components",
"version": "1.0.282",
"version": "1.0.285",
"description": "Ascensio System SIA component library",
"license": "AGPL-3.0",
"main": "dist/asc-web-components.js",

6
web/ASC.Web.Components/src/components/combobox/combobox.stories.js
View File

@ -119,7 +119,8 @@ storiesOf('Components|Input', module)
onSelect={option => action("Selected option")(option)}
selectedOption={{
key: 0,
label: 'Select'
label: 'Select',
default: true
}}
isDisabled={boolean('isDisabled', false)}
noBorder={boolean('noBorder', false)}
@ -138,7 +139,8 @@ storiesOf('Components|Input', module)
onSelect={option => action("Selected option")(option)}
selectedOption={{
key: 0,
label: 'Select'
label: 'Select',
default: true
}}
isDisabled={boolean('isDisabled', false)}
scaled={false}

6
web/ASC.Web.Components/src/components/combobox/sub-components/combo-button.js
View File

@ -59,7 +59,7 @@ const StyledComboButton = styled.div`
}
.combo-button-label{
margin-right: ${props => props.noBorder ? `4px` : `8px`};
color: ${props => props.isDisabled ? '#D0D5DA' : '#333333'};
/*color: ${props => props.isDisabled ? '#D0D5DA' : '#333333'};*/
max-width: 175px;
${props => props.noBorder && `
line-height: 15px;
@ -137,7 +137,7 @@ class ComboButton extends React.Component {
{React.createElement(Icons[selectedOption.icon],
{
size: 'scale',
color: boxIconColor,
color: selectedOption.default ? arrowIconColor : boxIconColor,
isfill: true
})
}
@ -150,7 +150,7 @@ class ComboButton extends React.Component {
truncate={true}
fontWeight={600}
className="combo-button-label"
color={boxIconColor + ' !important'}
color={selectedOption.default ? arrowIconColor : boxIconColor + ' !important'}
>
{selectedOption.label}
</Text>

15
web/ASC.Web.Components/src/components/text-input/index.js
View File

@ -7,7 +7,7 @@ import isEqual from "lodash/isEqual";
/* eslint-disable no-unused-vars */
/* eslint-disable react/prop-types */
const Input = ({ isAutoFocussed, isDisabled, isReadOnly, hasError, hasWarning, scale, withBorder, keepCharPositions, ...props }) =>
const Input = ({ isAutoFocussed, isDisabled, isReadOnly, hasError, hasWarning, scale, withBorder, keepCharPositions, fontWeight, isBold, ...props }) =>
(props.mask != null) ? <MaskedInput keepCharPositions {...props}/> : <input {...props}/>;
/* eslint-enable react/prop-types */
/* eslint-enable no-unused-vars */
@ -45,6 +45,11 @@ const StyledInput = styled(Input).attrs((props) => ({
(props.size === 'big' && '16px') ||
(props.size === 'huge' && '18px')
};
font-weight: ${props => props.fontWeight
? props.fontWeight
: props.isBold ? 600 : 'normal'};
flex: 1 1 0%;
outline: none;
overflow: hidden;
@ -116,7 +121,10 @@ TextInput.propTypes = {
autoComplete: PropTypes.string,
className: PropTypes.string,
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array])
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
fontWeight: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
isBold: PropTypes.bool,
}
TextInput.defaultProps = {
@ -130,7 +138,8 @@ TextInput.defaultProps = {
hasWarning: false,
autoComplete: 'off',
withBorder: true,
keepCharPositions: false
keepCharPositions: false,
isBold: false
}
export default TextInput