IlyaSobolev/DocSpace-buildtools
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:
Nikita Gopienko 2019-12-26 13:49:55 +03:00
commit beb42d4758
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/appsettings.json
View File

@ -59,7 +59,7 @@
"ConnectionStrings": {
"default": {
"name": "default",
"connectionString": "Server=localhost;Database=onlyoffice;User ID=dev;Password=dev;Pooling=true;Character Set=utf8;AutoEnlist=false;SSL Mode=none;AllowPublicKeyRetrieval=True",
"connectionString": "Server=localhost;Database=onlyoffice;User ID=dev;Password=dev;Pooling=true;Character Set=utf8;AutoEnlist=false;SSL Mode=none;AllowPublicKeyRetrieval=True"
"providerName": "MySql.Data.MySqlClient"
}
},

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

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

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

@ -14,7 +14,7 @@ const StyledFilterBlock = styled.div`
const StyledFilterItem = styled.div`
display: ${props => props.block ? 'flex' : 'inline-block'};
margin-bottom: ${props => props.block ? '3px' : '0'};
margin-bottom: ${props => props.block ? '8px' : '0'};
position: relative;
height: 100%;
padding: 3px 22px 3px 7px;
@ -50,8 +50,9 @@ const StyledComboBox = styled(ComboBox)`
max-width: 185px;
cursor: pointer;
vertical-align: middle;
div:first-child{
> div:first-child{
width: auto;
padding-left: 4px;
}
`;
const StyledFilterName = styled.span`

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

@ -42,7 +42,7 @@ const StyledHideFilter = styled.div`
`;
const DropDownStyle = styled.div`
.drop-down {
padding: 8px;
padding: 16px;
}
position: relative;
`;

4
web/ASC.Web.Components/src/components/filter-input/index.js
View File

@ -425,7 +425,7 @@ class FilterInput extends React.Component {
}
render() {
//console.log("FilterInput render");
let iconSize = 32;
let iconSize = 33;
switch (this.props.size) {
case 'base':
iconSize = 33;
@ -492,6 +492,7 @@ class FilterInput extends React.Component {
}
FilterInput.protoTypes = {
size: PropTypes.oneOf(['base', 'middle', 'big', 'huge']),
autoRefresh: PropTypes.bool,
selectedFilterData: PropTypes.object,
directionAscLabel: PropTypes.string,
@ -509,6 +510,7 @@ FilterInput.defaultProps = {
filterValues: [],
searchText: ''
},
size: 'base',
directionAscLabel: 'A-Z',
directionDescLabel: 'Z-A'
};

2
web/ASC.Web.Components/src/components/search-input/index.js
View File

@ -84,7 +84,7 @@ class SearchInput extends React.Component {
isIconFill={true}
iconSize={clearButtonSize}
iconColor={"#D0D5DA"}
hoverColor={"#555F65"}
hoverColor={!!this.state.inputValue || this.props.showClearButton ? "#555F65" : "#D0D5DA"}
onIconClick={!!this.state.inputValue || this.props.showClearButton ? this.clearSearch : undefined}
size={this.props.size}
scale={true}