diff --git a/public/icons/edit.svg b/public/icons/edit.svg
index abc01f82..385b1c7e 100644
--- a/public/icons/edit.svg
+++ b/public/icons/edit.svg
@@ -1,4 +1,5 @@
diff --git a/public/icons/user-link-default.svg b/public/icons/user-link-default.svg
new file mode 100644
index 00000000..d1e03c91
--- /dev/null
+++ b/public/icons/user-link-default.svg
@@ -0,0 +1,5 @@
+
+
diff --git a/src/components/Author/Card.module.scss b/src/components/Author/Card.module.scss
index 8400502f..4e8395da 100644
--- a/src/components/Author/Card.module.scss
+++ b/src/components/Author/Card.module.scss
@@ -3,35 +3,39 @@
display: flex;
margin-bottom: 2.4rem;
+ &:last-child {
+ margin-bottom: 0;
+ }
+
@include media-breakpoint-down(lg) {
flex-wrap: wrap;
}
}
-.authorDetails {
+.author__details {
display: flex;
flex: 1;
padding-right: 1.2rem;
width: max-content;
}
-.authorDetailsWrapper {
+.author__details-wrapper {
flex: 1;
}
-.authorName {
+.author__name {
border: none !important;
font-size: 1.7rem;
font-weight: 500;
margin-bottom: 0.8rem;
}
-.authorAbout {
+.author__about {
font-size: 1.5rem;
color: rgb(0 0 0 / 60%);
}
-.authorSubscribe {
+.author__subscribe {
@include media-breakpoint-down(lg) {
padding: 0 0 0 42px;
}
@@ -43,11 +47,11 @@
height: 32px;
margin-right: 0.4rem;
position: relative;
- transition: background-color 0.2s;
vertical-align: middle;
width: 32px;
&::before {
+ background-image: url(/icons/user-link-default.svg);
background-repeat: no-repeat;
background-position: 50% 50%;
background-size: contain;
@@ -58,17 +62,8 @@
position: absolute;
top: 50%;
transform: translate(-50%, -50%);
- transition: filter 0.2s;
width: 18px;
}
-
- &:hover {
- background: #000;
-
- &::before {
- filter: invert(0);
- }
- }
}
a[href*='facebook.com/'] {
@@ -100,15 +95,9 @@
background-image: url(/icons/tumblr-white.svg);
}
}
-
- a[href*='instagram.com/'] {
- &::before {
- background-image: url(/icons/instagram-white.svg);
- }
- }
}
-.buttonSubscribe {
+.button--subscribe {
align-items: center;
aspect-ratio: 1/1;
background: #f6f6f6;
@@ -121,23 +110,90 @@
}
}
-.buttonLabel {
+.button__label {
display: none;
}
-.buttonWrite {
+.button--write {
background: #f7f7f7;
color: #000;
display: inline-flex;
-
@include font-size(1.5rem);
+ &:hover {
+ background: #000;
+ color: #fff;
+
+ img {
+ filter: invert(1);
+ }
+ }
+
.icon {
margin-right: 0.5em;
}
img {
height: 15px;
+ transition: filter 0.3s;
+ }
+}
+
+.authorPage {
+ .authorName {
+ @include font-size(3.4rem);
+
+ font-weight: 500;
+ margin-bottom: 0.2em;
+ }
+
+ .authorAbout {
+ color: #696969;
+ @include font-size(1.7rem);
+ }
+
+ .authorSubscribe {
+ margin-top: 2rem;
+ }
+
+ .authorDetails {
+ display: block;
+ }
+
+ .buttonLabel {
+ display: block;
+ }
+
+ .buttonSubscribe {
+ aspect-ratio: auto;
+ background-color: #000;
+ border-radius: 2px;
+ float: none;
+ padding-bottom: 0.6rem;
+ padding-top: 0.6rem;
+
+ .icon {
+ margin-right: 0.5em;
+
+ img {
+ filter: invert(1);
+ }
+ }
+
+ &:hover {
+ .icon img {
+ filter: invert(0.7);
+ }
+ }
+ }
+
+ .buttonSubscribe img {
+ vertical-align: text-top;
+ }
+
+ .button {
+ margin-right: 1.6rem;
+ vertical-align: middle;
}
}
diff --git a/src/components/Author/Card.tsx b/src/components/Author/Card.tsx
index 4931f4b3..b4d3c735 100644
--- a/src/components/Author/Card.tsx
+++ b/src/components/Author/Card.tsx
@@ -19,6 +19,7 @@ interface AuthorCardProps {
subscribed?: boolean
author: Author
isAuthorPage?: boolean
+ noSocialButtons?: boolean
}
export const AuthorCard = (props: AuthorCardProps) => {
@@ -84,7 +85,9 @@ export const AuthorCard = (props: AuthorCardProps) => {
{t('Write')}
- {(link) => }
+
+ {(link) => }
+
diff --git a/src/components/Discours/Footer.scss b/src/components/Discours/Footer.module.scss
similarity index 78%
rename from src/components/Discours/Footer.scss
rename to src/components/Discours/Footer.module.scss
index b491d159..5697a6e3 100644
--- a/src/components/Discours/Footer.scss
+++ b/src/components/Discours/Footer.module.scss
@@ -1,4 +1,4 @@
-.discours-footer {
+.discoursFooter {
background: #000;
color: rgb(255 255 255 / 64%);
@include font-size(1.7rem);
@@ -34,21 +34,21 @@
margin-top: 0.8rem;
}
- .wide-container {
+ .wideContainer {
@include media-breakpoint-down(sm) {
padding: 0 $container-padding-x;
}
}
}
-.discours-footer__content {
+.discoursFooterContent {
display: flex;
flex-direction: column;
justify-content: center;
padding-left: $grid-gutter-width;
}
-.footer-copyright {
+.footerCopyright {
border-top: 5px solid #404040;
color: #696969;
@include font-size(1.5rem);
@@ -56,7 +56,7 @@
padding-top: 1.6rem;
}
-.footer-copyright__social {
+.footerCopyrightSocial {
display: flex;
.icon {
@@ -75,12 +75,19 @@
}
}
-.social__item {
- text-align: right;
+.socialItem {
+ margin-top: 1em;
+ text-align: center;
width: 25%;
+
+ @include media-breakpoint-up(md) {
+ margin-top: 0;
+ margin-left: 0.3em;
+ text-align: right;
+ }
}
-.social__item--vk {
+.socialItemvk {
img {
max-width: 25px;
}
diff --git a/src/components/Discours/Footer.tsx b/src/components/Discours/Footer.tsx
index dcd8b330..ed0a50f7 100644
--- a/src/components/Discours/Footer.tsx
+++ b/src/components/Discours/Footer.tsx
@@ -1,9 +1,10 @@
import { createMemo, For } from 'solid-js'
-import './Footer.scss'
+import styles from './Footer.module.scss'
import { Icon } from '../Nav/Icon'
import Subscribe from './Subscribe'
import { t } from '../../utils/intl'
import { locale } from '../../stores/ui'
+import {clsx} from "clsx";
export const Footer = () => {
const locale_title = createMemo(() => (locale() === 'ru' ? 'English' : 'Русский'))
@@ -107,12 +108,12 @@ export const Footer = () => {
}
]
return (
-