From 6003d44684639de93bc803ca82ead655e534f211 Mon Sep 17 00:00:00 2001 From: Daniil Senkiv Date: Tue, 13 Aug 2019 14:45:35 +0300 Subject: [PATCH] Web: components: Link, ToggleContent: fixed border bottom style --- web/ASC.Web.Components/src/components/link/index.js | 11 +++++------ .../src/components/toggle-content/index.js | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web/ASC.Web.Components/src/components/link/index.js b/web/ASC.Web.Components/src/components/link/index.js index 392eb594f2..8a888b64da 100644 --- a/web/ASC.Web.Components/src/components/link/index.js +++ b/web/ASC.Web.Components/src/components/link/index.js @@ -23,7 +23,7 @@ const colorCss = css` const hoveredCss = css` ${colorCss}; - border-bottom: ${props => (props.type === 'action' ? '1px dotted;' : 'none')}; + border-bottom: ${props => (props.type === 'action' ? '1px dashed;' : 'none')}; text-decoration: ${props => (props.type === 'page' ? 'underline' : 'none')}; `; @@ -80,12 +80,11 @@ Link.propTypes = { isSemitransparent: PropTypes.bool, isTextOverflow: PropTypes.bool, onClick: PropTypes.func, + rel: PropTypes.string, + tabIndex: PropTypes.number, target: PropTypes.oneOf(["_blank", "_self", "_parent", "_top"]), - text: PropTypes.string, title: PropTypes.string, type: PropTypes.oneOf(["action", "page"]), - tabIndex: PropTypes.number, - rel: PropTypes.string, }; Link.defaultProps = { @@ -96,9 +95,9 @@ Link.defaultProps = { isHovered: false, isSemitransparent: false, isTextOverflow: true, - type: "page", + rel: "noopener noreferrer", tabIndex: -1, - rel: "noopener noreferrer" + type: "page", }; export default Link; diff --git a/web/ASC.Web.Components/src/components/toggle-content/index.js b/web/ASC.Web.Components/src/components/toggle-content/index.js index b667625ae4..d8eb4fd35c 100644 --- a/web/ASC.Web.Components/src/components/toggle-content/index.js +++ b/web/ASC.Web.Components/src/components/toggle-content/index.js @@ -31,7 +31,7 @@ const StyledText = styled(Text.Headline)` line-height: 26px; font-style: normal; &:hover{ - border-bottom: 1px dotted; + border-bottom: 1px dashed; } `;