From ea5aed37f909674dca94fcba472e01f68fb68803 Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Fri, 29 Apr 2022 14:26:52 +0300 Subject: [PATCH 1/4] Web: Common: FloatingButton: fix z-index --- .../components/FloatingButton/StyledFloatingButton.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/asc-web-common/components/FloatingButton/StyledFloatingButton.js b/packages/asc-web-common/components/FloatingButton/StyledFloatingButton.js index 0252af3511..624dd0009b 100644 --- a/packages/asc-web-common/components/FloatingButton/StyledFloatingButton.js +++ b/packages/asc-web-common/components/FloatingButton/StyledFloatingButton.js @@ -2,6 +2,8 @@ import Base from "@appserver/components/themes/base"; import styled, { keyframes, css } from "styled-components"; const StyledCircleWrap = styled.div` + position: relative; + z-index: 500; width: 48px; height: 48px; background: ${(props) => From 2e33c99230b57dac23610dfb9c49e9925128335b Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 29 Apr 2022 14:52:56 +0300 Subject: [PATCH 2/4] Web: Client: Files: Badges: Added medium (16px) icon for form badge. Fixed displaying for form badge --- .../ASC.Files/Client/src/components/Badges.js | 19 +++++++++++-------- .../images/access.edit.form.medium.react.svg | 3 +++ 2 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 public/images/access.edit.form.medium.react.svg diff --git a/products/ASC.Files/Client/src/components/Badges.js b/products/ASC.Files/Client/src/components/Badges.js index 4139f319e2..976f2b9eec 100644 --- a/products/ASC.Files/Client/src/components/Badges.js +++ b/products/ASC.Files/Client/src/components/Badges.js @@ -85,14 +85,6 @@ const Badges = ({ const isForm = fileExst === ".oform"; const isTile = viewAs === "tile"; - const iconEdit = isForm - ? "/static/images/access.edit.form.react.svg" - : "/static/images/file.actions.convert.edit.doc.react.svg"; - - const iconForm = "/static/images/access.edit.form.react.svg"; - - const iconRefresh = "/static/images/refresh.react.svg"; - const countVersions = versionGroup > 999 ? "999+" : versionGroup; const contentNewItems = newItems > 999 ? "999+" : newItems; @@ -108,6 +100,17 @@ const Badges = ({ const fontSizeBadge = isTile || tabletViewBadge ? "11px" : "9px"; + const iconForm = + sizeBadge === "medium" + ? "/static/images/access.edit.form.medium.react.svg" + : "/static/images/access.edit.form.react.svg"; + + const iconEdit = !isForm + ? "/static/images/file.actions.convert.edit.doc.react.svg" + : iconForm; + + const iconRefresh = "/static/images/refresh.react.svg"; + const commonBadgeProps = { borderRadius: "11px", color: theme.filesBadges.color, diff --git a/public/images/access.edit.form.medium.react.svg b/public/images/access.edit.form.medium.react.svg new file mode 100644 index 0000000000..8933b80ae1 --- /dev/null +++ b/public/images/access.edit.form.medium.react.svg @@ -0,0 +1,3 @@ + + + From e18778280d26930a14c6789062322cf89d2cf88b Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Fri, 29 Apr 2022 15:13:56 +0300 Subject: [PATCH 3/4] Web: Components: fixed main-button-mobile click --- packages/asc-web-components/drop-down/index.js | 2 +- packages/asc-web-components/main-button-mobile/index.js | 6 +++--- .../main-button-mobile/styled-main-button.js | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/asc-web-components/drop-down/index.js b/packages/asc-web-components/drop-down/index.js index 7bf3c49bc5..ba07e0e5dd 100644 --- a/packages/asc-web-components/drop-down/index.js +++ b/packages/asc-web-components/drop-down/index.js @@ -62,7 +62,7 @@ class DropDown extends React.PureComponent { componentDidUpdate(prevProps) { if (this.props.open !== prevProps.open) { if (this.props.open) { - this.props.enableOnClickOutside(); + !isMobile && this.props.enableOnClickOutside(); //fixed main-button-mobile click, remove !isMobile if have dd problem this.bindDocumentResizeListener(); if (this.props.isDefaultMode) { return this.checkPositionPortal(); diff --git a/packages/asc-web-components/main-button-mobile/index.js b/packages/asc-web-components/main-button-mobile/index.js index 01a704de0b..8e1fb3b3b8 100644 --- a/packages/asc-web-components/main-button-mobile/index.js +++ b/packages/asc-web-components/main-button-mobile/index.js @@ -16,7 +16,7 @@ import IconButton from "../icon-button"; import Button from "../button"; import Text from "../text"; import Scrollbar from "@appserver/components/scrollbar"; -import { isMobile, isTablet } from "react-device-detect"; +import { isMobile } from "react-device-detect"; import Backdrop from "../backdrop"; const ProgressBarMobile = ({ @@ -237,13 +237,13 @@ const MainButtonMobile = (props) => { manualWidth={manualWidth || "400px"} directionY="top" directionX="right" - isMobile={isMobile || isTablet} + isMobile={isMobile} fixedDirection={true} heightProp={height} sectionWidth={sectionWidth} isDefaultMode={false} > - {isMobile || isTablet ? ( + {isMobile ? ( props.theme.mainButtonMobile.buttonColor} !important; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); + .circle__mask + div { display: flex; align-items: center; From 17daa3d46c187fb160487b041d48681990d6cf46 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Fri, 29 Apr 2022 15:26:40 +0300 Subject: [PATCH 4/4] Web: Files: fixed info-panel styles --- .../Client/src/pages/Home/InfoPanel/Body/styles/styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/products/ASC.Files/Client/src/pages/Home/InfoPanel/Body/styles/styles.js b/products/ASC.Files/Client/src/pages/Home/InfoPanel/Body/styles/styles.js index 8b60931443..72dd9c9b9b 100644 --- a/products/ASC.Files/Client/src/pages/Home/InfoPanel/Body/styles/styles.js +++ b/products/ASC.Files/Client/src/pages/Home/InfoPanel/Body/styles/styles.js @@ -3,7 +3,7 @@ import styled from "styled-components"; import { Base } from "@appserver/components/themes"; const StyledInfoRoomBody = styled.div` - padding: 0px 0px 0 16px; + padding-left: 20px; height: auto; background-color: ${(props) => props.theme.infoPanel.backgroundColor}; color: ${(props) => props.theme.infoPanel.textColor};