IlyaSobolev/DocSpace-buildtools
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-26 16:53:17 +03:00
commit 33401f4a6d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -17,7 +17,7 @@ const StyledFilterItem = styled.div`
margin-bottom: ${props => props.block ? '8px' : '0'};
position: relative;
height: 100%;
padding: 3px 22px 3px 7px;
padding: 4px 22px 2px 7px;
margin-right: 2px;
border: 1px solid #ECEEF1;
border-radius: 3px;

6
web/ASC.Web.Components/src/components/selected-item/index.js
View File

@ -31,7 +31,7 @@ const StyledCloseButton = styled.div`
&:hover{
path{
${props => !props.isDisabled && "fill: #333;"}
${props => !props.isDisabled && "fill: #555F65;"}
}
}
@ -42,13 +42,13 @@ const StyledCloseButton = styled.div`
const SelectedItem = (props) => {
const { isDisabled, text, onClose } = props;
const colorProps = isDisabled ? { color: "#D0D5DA" } : {};
const colorProps = { color: isDisabled ? "#D0D5DA" : "#555F65" };
//console.log("SelectedItem render");
return (
<StyledSelectedItem {...props}>
<StyledSelectedTextBox>
<Text as='span' truncate {...colorProps} >
<Text as='span' truncate {...colorProps} fontWeight={600}>
{text}
</Text>
</StyledSelectedTextBox>