From e93acc8a02fd84d17a6b7de51427444c69b3da5a Mon Sep 17 00:00:00 2001 From: Aleksandr Dronov Date: Wed, 13 Sep 2023 13:02:54 +0300 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D1=82=D0=B0=20Link?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../author-page/overview/overview.module.css | 7 ++++++ .../author-page/overview/overview.tsx | 4 ++-- src/components/ui/link/index.ts | 1 - src/components/ui/link/link.module.css | 11 --------- src/components/ui/link/link.tsx | 24 ------------------- 5 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 src/components/ui/link/index.ts delete mode 100644 src/components/ui/link/link.module.css delete mode 100644 src/components/ui/link/link.tsx diff --git a/src/components/author-page/overview/overview.module.css b/src/components/author-page/overview/overview.module.css index 2f083efe9..98d90674a 100644 --- a/src/components/author-page/overview/overview.module.css +++ b/src/components/author-page/overview/overview.module.css @@ -222,6 +222,13 @@ min-width: 25px; } +.tagLink { + display: inline-block; + border-bottom: 1px solid currentColor; + color: inherit; + text-decoration: none; +} + .overviewContacts { max-width: 610px; } diff --git a/src/components/author-page/overview/overview.tsx b/src/components/author-page/overview/overview.tsx index ce79b00ce..189e8ec24 100644 --- a/src/components/author-page/overview/overview.tsx +++ b/src/components/author-page/overview/overview.tsx @@ -1,4 +1,5 @@ import cn from 'classnames/bind'; +import Link from 'next/link'; import { useMemo,useState } from 'react'; import { PlayCard } from 'components/play-card'; @@ -6,7 +7,6 @@ import { PlayList } from 'components/play-list'; import { Section } from 'components/section'; import { Button } from 'components/ui/button'; import { InfoLink } from 'components/ui/info-link'; -import { Link } from 'components/ui/link'; import { Tag } from 'components/ui/tag'; import * as breakpoints from 'shared/breakpoints.js'; import { numberOfCharacters } from 'shared/constants/numbers'; @@ -171,7 +171,7 @@ export const AuthorOverview: React.FC = (props) => { {achievements.map((item, idx) => (
- + > = (props) => { - const { - children, - ...restLinkProps - } = props; - - return ( - <_Link {...restLinkProps}> - - {children} - - - ); -}; From f2c07b3f480e5d80f52a7c6c341a0688bf6ae984 Mon Sep 17 00:00:00 2001 From: Aleksandr Dronov Date: Sat, 16 Sep 2023 12:51:01 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD=D0=B0=20Link?= =?UTF-8?q?=20=D0=BD=D0=B0InfoLink?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../author-page/overview/overview.module.css | 4 ++-- src/components/author-page/overview/overview.tsx | 14 ++++++-------- src/components/ui/info-link/info-link.module.css | 13 +++++++++++++ src/components/ui/info-link/info-link.tsx | 4 ++-- 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/components/author-page/overview/overview.module.css b/src/components/author-page/overview/overview.module.css index 98d90674a..b5f457321 100644 --- a/src/components/author-page/overview/overview.module.css +++ b/src/components/author-page/overview/overview.module.css @@ -268,7 +268,7 @@ } .overviewTagsBlock { - margin: 0 0 53px; + margin: 0 0 45px; } .overviewSocialLinkBlock { @@ -307,5 +307,5 @@ .tag { display: inline-block; - margin: 0 8px 8px 0; + margin: 0px 8px 8px 0; } diff --git a/src/components/author-page/overview/overview.tsx b/src/components/author-page/overview/overview.tsx index 189e8ec24..4f8ec0ce7 100644 --- a/src/components/author-page/overview/overview.tsx +++ b/src/components/author-page/overview/overview.tsx @@ -170,14 +170,12 @@ export const AuthorOverview: React.FC = (props) => {
{achievements.map((item, idx) => (
- - - - - +
) )} diff --git a/src/components/ui/info-link/info-link.module.css b/src/components/ui/info-link/info-link.module.css index 4d81eb4a2..c2200b1f1 100644 --- a/src/components/ui/info-link/info-link.module.css +++ b/src/components/ui/info-link/info-link.module.css @@ -126,6 +126,14 @@ border-left: 1px solid var(--coal); } +.borderLeftBottomRight { + display: inline-block; + padding: 4px 8px 8px; + border-bottom: 1px solid var(--coal); + border-left: 1px solid var(--coal); + border-right: 1px solid var(--coal); +} + .borderTop { width: inherit; justify-content: space-between; @@ -149,6 +157,7 @@ @mixin textHistorySmall; } + .l { @mixin headline; @mixin headline7; @@ -162,3 +171,7 @@ @mixin headline; @mixin headline4; } + +.textMedium { + @mixin textMedium; +} diff --git a/src/components/ui/info-link/info-link.tsx b/src/components/ui/info-link/info-link.tsx index e2e112edb..5c20ef95d 100644 --- a/src/components/ui/info-link/info-link.tsx +++ b/src/components/ui/info-link/info-link.tsx @@ -17,10 +17,10 @@ export interface ILinkProps { icon?: IIconProps['glyph'] iconPlace?: 'iconNone' | 'left' | 'right' hoverStyle?: 'invert' | 'bottomLine' | 'bottomLineAndInvert' - size?: 'xs' | 's' | 'm' | 'l' | 'xl' | 'number' + size?: 'xs' | 's' | 'm' | 'l' | 'xl' | 'number' | 'textMedium' textDecoration?: 'textDecorationNone' | 'underline' textTransform?: 'uppercase' - border?: 'borderNone' | 'borderBottomLeft' | 'borderTop' + border?: 'borderNone' | 'borderBottomLeft' | 'borderTop' | 'borderLeftBottomRight' className?: string iconClassName?: string } From 666bec8dd09654fb52a808ac0fae44fec7be00ca Mon Sep 17 00:00:00 2001 From: Aleksandr Dronov Date: Sat, 16 Sep 2023 12:56:00 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA?= =?UTF-8?q?=20=D0=BB=D0=B8=D0=BD=D1=82=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/author-page/overview/overview.module.css | 2 +- src/components/author-page/overview/overview.tsx | 2 -- src/components/ui/info-link/info-link.module.css | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/components/author-page/overview/overview.module.css b/src/components/author-page/overview/overview.module.css index b5f457321..87ef2ec76 100644 --- a/src/components/author-page/overview/overview.module.css +++ b/src/components/author-page/overview/overview.module.css @@ -307,5 +307,5 @@ .tag { display: inline-block; - margin: 0px 8px 8px 0; + margin: 0 8px 8px 0; } diff --git a/src/components/author-page/overview/overview.tsx b/src/components/author-page/overview/overview.tsx index 4f8ec0ce7..923ef09f2 100644 --- a/src/components/author-page/overview/overview.tsx +++ b/src/components/author-page/overview/overview.tsx @@ -1,5 +1,4 @@ import cn from 'classnames/bind'; -import Link from 'next/link'; import { useMemo,useState } from 'react'; import { PlayCard } from 'components/play-card'; @@ -7,7 +6,6 @@ import { PlayList } from 'components/play-list'; import { Section } from 'components/section'; import { Button } from 'components/ui/button'; import { InfoLink } from 'components/ui/info-link'; -import { Tag } from 'components/ui/tag'; import * as breakpoints from 'shared/breakpoints.js'; import { numberOfCharacters } from 'shared/constants/numbers'; import { useMediaQuery } from 'shared/hooks/use-media-query'; diff --git a/src/components/ui/info-link/info-link.module.css b/src/components/ui/info-link/info-link.module.css index c2200b1f1..15f677661 100644 --- a/src/components/ui/info-link/info-link.module.css +++ b/src/components/ui/info-link/info-link.module.css @@ -129,9 +129,9 @@ .borderLeftBottomRight { display: inline-block; padding: 4px 8px 8px; + border-right: 1px solid var(--coal); border-bottom: 1px solid var(--coal); border-left: 1px solid var(--coal); - border-right: 1px solid var(--coal); } .borderTop { @@ -157,7 +157,6 @@ @mixin textHistorySmall; } - .l { @mixin headline; @mixin headline7;