diff --git a/src/components/Button/Buttom.tsx b/src/components/Button/Buttom.tsx deleted file mode 100644 index 9fcdb9e..0000000 --- a/src/components/Button/Buttom.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import React from "react"; - -interface Btn { - text: string; - type: "button" | "submit" | "reset"; - className: string; -} - -const Button = ( props: Btn ) => { - const { text, type, className } = props; - - return ( - - ); -}; - -export { Button }; diff --git a/src/components/Main/Main.module.scss b/src/components/Main/Main.module.scss index c330929..2f41753 100644 --- a/src/components/Main/Main.module.scss +++ b/src/components/Main/Main.module.scss @@ -16,6 +16,14 @@ @media (min-width: 2500px) { width: 31px; } + + &:hover { + filter: brightness(80%); + } + + &:active { + filter: brightness(100%); + } } &__arrow-icon { @@ -26,6 +34,14 @@ width: 15px; height: 15px; } + + &:hover { + filter: brightness(80%); + } + + &:active { + filter: brightness(100%); + } } &__text { @@ -37,6 +53,14 @@ font-size: 24px; line-height: 28px; } + + &:hover { + filter: brightness(80%); + } + + &:active { + filter: brightness(100%); + } } } diff --git a/src/components/MenuSideBar/MenuSideBar.module.scss b/src/components/MenuSideBar/MenuSideBar.module.scss index ea7b8bb..3d32f68 100644 --- a/src/components/MenuSideBar/MenuSideBar.module.scss +++ b/src/components/MenuSideBar/MenuSideBar.module.scss @@ -2,11 +2,12 @@ .menu-sidebar { border-right: 1px solid variables.$black; - width: 302px; + width: 27.97%; + min-width: 302px; height: 285px; @media (min-width: 2500px) { - width: 590px; + min-width: 590px; height: 485px; } @@ -14,6 +15,7 @@ border: none; height: 224px; width: 100%; + min-width: 100%; } &__container { diff --git a/src/components/Newsletter/Newsletter.module.scss b/src/components/Newsletter/Newsletter.module.scss index 544feba..69d026a 100644 --- a/src/components/Newsletter/Newsletter.module.scss +++ b/src/components/Newsletter/Newsletter.module.scss @@ -136,7 +136,7 @@ text-transform: uppercase; &:hover { - filter: opacity(.9); + filter: opacity(.85); } &:active { @@ -166,35 +166,35 @@ } } } -} -span { - font-size: 12px; - line-height: 14px; - color: variables.$red; - position: absolute; - right: 0; - top: 14px; - - @media (min-width: 3600px) { - font-size: 26px; - line-height: 30px; - top: 20px; - } - - @media ((min-width: 2500px) and (max-width: 3599px)) { - font-size: 24px; - line-height: 28px; - top: 20px; - } - - @media (min-width: 350px) and (max-width: 1024px) { - right: 16px; - } - - @media (max-width: 349px) { - font-size: 11px; - top: 18px; - right: 16px; + &__invalid-feedback { + font-size: 12px; + line-height: 14px; + color: variables.$red; + position: absolute; + right: 0; + top: 14px; + + @media (min-width: 3600px) { + font-size: 26px; + line-height: 30px; + top: 20px; + } + + @media ((min-width: 2500px) and (max-width: 3599px)) { + font-size: 24px; + line-height: 28px; + top: 20px; + } + + @media (min-width: 350px) and (max-width: 1024px) { + right: 16px; + } + + @media (max-width: 349px) { + font-size: 11px; + top: 18px; + right: 16px; + } } } diff --git a/src/components/Newsletter/Newsletter.tsx b/src/components/Newsletter/Newsletter.tsx index 2466510..586216f 100644 --- a/src/components/Newsletter/Newsletter.tsx +++ b/src/components/Newsletter/Newsletter.tsx @@ -5,7 +5,6 @@ import { Formik, Form, Field, ErrorMessage, FormikHelpers} from "formik"; import styles from "./Newsletter.module.scss"; import NewsletterSchema from "./Schema/NewsletterSchema"; -import { Button } from "../Button/Buttom"; interface NewsletterValue { email: string; @@ -40,10 +39,12 @@ const Newsletter = () => {