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

Merge branch 'master' of github.com:ONLYOFFICE/AppServer

Browse Source
This commit is contained in:
Alexey Safronov 2019-12-27 15:47:52 +03:00
commit ec6c1a3651
12 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ const Container = styled.div`
margin: 0 0 16px 0;
.remove_icon {
margin-left: 8px;
padding-left: 8px;
}
`;

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

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

1
web/ASC.Web.Components/src/components/filter-input/filter-block.js
View File

@ -37,6 +37,7 @@ const StyledFilterItem = styled.div`
const StyledFilterItemContent = styled.div`
display: flex;
padding: 5px 4px 2px 7px;
width: 100%;
${props =>
props.isOpen && !props.isDisabled &&
css`

2
web/ASC.Web.Components/src/components/filter-input/sort-combobox.js
View File

@ -98,6 +98,7 @@ class SortComboBox extends React.Component {
spacing='0px'
name={'direction'}
options={sortDirectionArray}
fontWeight ={600}
/>
</DropDownItem>
<DropDownItem isSeparator />
@ -110,6 +111,7 @@ class SortComboBox extends React.Component {
spacing='0px'
name={'sort'}
options={sortArray}
fontWeight ={600}
/>
</DropDownItem>
</>

2
web/ASC.Web.Components/src/components/link/link.stories.js
View File

@ -34,7 +34,7 @@ storiesOf('Components|Link', module)
type={select('type', type, 'page')}
color={color('color', '#333333')}
fontSize={text('fontSize', '13px')}
fontWeight={text('fontWeight', '700')}
fontWeight={text('fontWeight', '400')}
isBold={boolean('isBold', false)}
title={text('title', undefined)}
target={select('target', target, '_blank')}

2
web/ASC.Web.Components/src/components/radio-button-group/README.md
View File

@ -35,3 +35,5 @@ import { RadioButtonGroup } from "asc-web-components";
| `spacing` | `string` | - | - | `15px` | Margin between radiobutton. If orientation `horizontal`, it is `margin-left`(apply for all radiobuttons, except first), if orientation `vertical`, it is `margin-bottom`(apply for all radiobuttons, except last) |
| `style` | `obj`, `array` | - | - | - | Accepts css style |
| `width` | `string` | - | - | `100%` | Width of RadioButtonGroup container |
| `fontSize` | `string` | - | - | - | Font size of link |
| `fontWeight` |`number, string`| - | - | - | Font weight of link |

4
web/ASC.Web.Components/src/components/radio-button-group/index.js
View File

@ -61,6 +61,8 @@ class RadioButtonGroup extends React.Component {
isDisabled={this.props.isDisabled || option.disabled}
label={option.label}
fontSize={this.props.fontSize}
fontWeight={this.props.fontWeight}
spacing={this.props.spacing}
orientation={this.props.orientation}
/>
@ -89,6 +91,8 @@ RadioButtonGroup.propTypes = {
style: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
orientation: PropTypes.oneOf(['horizontal', 'vertical']),
width: PropTypes.string,
fontSize: PropTypes.string,
fontWeight: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
}
RadioButtonGroup.defaultProps = {

2
web/ASC.Web.Components/src/components/radio-button-group/radio-button-group.stories.js
View File

@ -54,6 +54,8 @@ storiesOf('Components|Input', module)
orientation={select('orientation', orientation, 'horizontal')}
width={text('width', '100%')}
isDisabled={boolean('isDisabled', false)}
fontSize={text('fontSize', '13px')}
fontWeight={text('fontWeight', '400')}
selected={values[0]}
spacing={text('spacing', '15px')}
name={text('name', 'group')}

2
web/ASC.Web.Components/src/components/radio-button/README.md
View File

@ -23,6 +23,8 @@ import { RadioButton } from "asc-web-components";
| `isChecked` | `bool` | - | - | `false` | Used as HTML `checked` property for each `<input>` tag |
| `isDisabled` | `bool` | - | - | `false` | Used as HTML `disabled` property for each `<input>` tag |
| `label` | `string` | - | - | - | Name of the radiobutton. If missed, `value` will be used |
| `fontSize` | `string` | - | - | - | Font size of link |
| `fontWeight` |`number, string`| - | - | - | Font weight of link |
| `name` | `string` | ✅ | - | - | Used as HTML `name` property for `<input>` tag. |
| `onClick` | `func` | - | - | - | Allow you to handle clicking events on component |
| `orientation` | `oneOf` | - | `vertical`, `horizontal` | `horizontal` | Position of radiobuttons |

4
web/ASC.Web.Components/src/components/radio-button/index.js
View File

@ -123,6 +123,8 @@ class RadioButton extends React.Component {
<RadiobuttonIcon {...this.props} />
<Text
as='span'
fontSize={this.props.fontSize}
fontWeight={this.props.fontWeight}
{...colorProps}
>
{this.props.label || this.props.value}
@ -136,6 +138,8 @@ RadioButton.propTypes = {
isChecked: PropTypes.bool,
isDisabled: PropTypes.bool,
label: PropTypes.string,
fontSize: PropTypes.string,
fontWeight: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
name: PropTypes.string.isRequired,
onChange: PropTypes.func,
onClick: PropTypes.func,

2
web/ASC.Web.Components/src/components/radio-button/radio-button.stories.js
View File

@ -17,6 +17,8 @@ storiesOf('Components|Input', module)
value={text('value', 'value')}
name={text('name', 'name')}
label={text('label', 'Label')}
fontSize={text('fontSize', '13px')}
fontWeight={text('fontWeight', '400')}
isDisabled={boolean('isDisabled', false)}
isChecked={boolean('isChecked', false)}
onClick={(e) => {

2
web/ASC.Web.Components/src/components/text/text.stories.js
View File

@ -19,7 +19,7 @@ storiesOf('Components|Text', module)
title={text('title', '')}
as={select('as', textTags , 'p')}
fontSize={text('fontSize', '13px')}
fontWeight={text('fontWeight', '700')}
fontWeight={text('fontWeight', '400')}
truncate={boolean('truncate', false)}
color={color('color', '#333333')}
backgroundColor={color('backgroundColor', '')}