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

Merge branch 'feature/fix-hide/show-header' of github.com:ONLYOFFICE/AppServer into feature/fix-hide/show-header

Browse Source
This commit is contained in:
TatianaLopaeva 2020-11-11 20:31:52 +03:00
commit 171c2695d9
2 changed files with 5 additions and 4 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", "name": "asc-web-components",
"version": "1.0.483", "version": "1.0.484",
"description": "Ascensio System SIA component library", "description": "Ascensio System SIA component library",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"main": "dist/asc-web-components.js", "main": "dist/asc-web-components.js",

7
web/ASC.Web.Components/src/components/drop-down/index.js
View File

@ -24,12 +24,12 @@ const StyledDropdown = styled.div`
${(props) => ${(props) =>
props.directionY === "top" && props.directionY === "top" &&
css` css`
bottom: ${(props) => (props.manualY ? props.manualY : "auto")}; bottom: ${(props) => (props.manualY ? props.manualY : "100%")};
`} `}
${(props) => ${(props) =>
props.directionY === "bottom" && props.directionY === "bottom" &&
css` css`
top: ${(props) => (props.manualY ? props.manualY : "auto")}; top: ${(props) => (props.manualY ? props.manualY : "100%")};
`} `}
${(props) => ${(props) =>
props.directionX === "right" && props.directionX === "right" &&
@ -42,7 +42,8 @@ const StyledDropdown = styled.div`
left: ${(props) => (props.manualX ? props.manualX : "0px")}; left: ${(props) => (props.manualX ? props.manualX : "0px")};
`} `}
z-index: 150; z-index: 150;
display: ${(props) => (props.open ? "block" : "none")}; display: ${(props) =>
props.open ? (props.columnCount ? "block" : "table") : "none"};
background: #ffffff; background: #ffffff;
border-radius: 6px; border-radius: 6px;
-moz-border-radius: 6px; -moz-border-radius: 6px;