From 73c9101be251d4b406f2aef5f428718674675368 Mon Sep 17 00:00:00 2001 From: Victor Batischev Date: Wed, 31 Jan 2024 16:25:06 +0300 Subject: [PATCH] style fix --- src/components/AuthBlock/authBlock.scss | 2 +- src/components/CardArticle/cardArticle.scss | 7 +++++- .../FrequentlyAskedQuestionsItem.scss | 5 ++-- src/components/SideBar/sidebar.scss | 10 ++++---- src/pages/Article/Article.jsx | 2 +- src/pages/Article/article.scss | 7 +++--- src/pages/Blog/Blog.jsx | 2 +- src/pages/Blog/blog.scss | 2 +- .../FrequentlyAskedQuestions.scss | 4 ++-- src/pages/TrackerAuth/TrackerAuth.js | 6 ++--- src/pages/TrackerAuth/trackerAuth.scss | 2 +- .../TrackerRegistration.js | 24 +++++++++---------- .../trackerRegistration.scss | 9 ++----- 13 files changed, 42 insertions(+), 40 deletions(-) diff --git a/src/components/AuthBlock/authBlock.scss b/src/components/AuthBlock/authBlock.scss index 30131fcb..b59fe3ec 100644 --- a/src/components/AuthBlock/authBlock.scss +++ b/src/components/AuthBlock/authBlock.scss @@ -144,7 +144,7 @@ &__img { position: absolute; right: 48px; - top: -90px; + top: -20px; @media (max-width: 900px) { order: 1; diff --git a/src/components/CardArticle/cardArticle.scss b/src/components/CardArticle/cardArticle.scss index a569ab0b..350817b8 100644 --- a/src/components/CardArticle/cardArticle.scss +++ b/src/components/CardArticle/cardArticle.scss @@ -29,8 +29,13 @@ display: flex; padding: 0 0 14px 16px; + p { + font-size: 13px; + } + img { - margin-right: 9px; + width: 15px; + margin-right: 5px; } } } diff --git a/src/components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem.scss b/src/components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem.scss index ac6ad084..5d947437 100644 --- a/src/components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem.scss +++ b/src/components/FrequentlyAskedQuestionsItem/FrequentlyAskedQuestionsItem.scss @@ -3,14 +3,15 @@ .frequently-asked-questions-item { &__head { display: flex; + align-items: center; gap: 19px; - margin: 0 0 -5px 29px; + margin: 0 0 0px 29px; } &__title { font-weight: 700; @include adaptiv-value("font-size", 28, 22, 1); - line-height: 79%; + line-height: 100%; color: #1458dd; } diff --git a/src/components/SideBar/sidebar.scss b/src/components/SideBar/sidebar.scss index f963b3b4..f24492f9 100644 --- a/src/components/SideBar/sidebar.scss +++ b/src/components/SideBar/sidebar.scss @@ -3,7 +3,7 @@ position: fixed; top: 0; left: 0; - width: 141px; + width: 100px; height: 100%; background: #e1fccf; @@ -108,7 +108,7 @@ } .auth-body { - padding: 40px; + padding: 40px 10px; visibility: hidden; transition: 0.2s ease-in-out; opacity: 0; @@ -125,7 +125,7 @@ &__title { display: flex; margin-top: 24px; - + img { width: 160px; } @@ -184,8 +184,8 @@ transition: 0.1s ease-in-out; opacity: 1; display: flex; - width: 424px; - left: 140px; + width: 280px; + left: 100px; @media (max-width: 1440px) { left: 79px; diff --git a/src/pages/Article/Article.jsx b/src/pages/Article/Article.jsx index ec042b9c..d74843aa 100644 --- a/src/pages/Article/Article.jsx +++ b/src/pages/Article/Article.jsx @@ -41,7 +41,7 @@ export const Article = () => {
-
+
{
-
+
{ const [modalResetOpen, setModalReset] = useState(false); return ( -
+
-
+
-

+

Войдите в свое{" "} рабочее пространство diff --git a/src/pages/TrackerAuth/trackerAuth.scss b/src/pages/TrackerAuth/trackerAuth.scss index e8043782..a9a6c003 100644 --- a/src/pages/TrackerAuth/trackerAuth.scss +++ b/src/pages/TrackerAuth/trackerAuth.scss @@ -1,4 +1,4 @@ -.trackerAuth { +.tracker-auth { &__content { font-family: "LabGrotesque", sans-serif; background-color: #f1f1f1; diff --git a/src/pages/TrackerRegistration/TrackerRegistration.js b/src/pages/TrackerRegistration/TrackerRegistration.js index 1c504ba7..2aa01647 100644 --- a/src/pages/TrackerRegistration/TrackerRegistration.js +++ b/src/pages/TrackerRegistration/TrackerRegistration.js @@ -19,25 +19,25 @@ export const TrackerRegistration = () => { }); return ( -
+
-
+
-

+

Создайте свое{" "} рабочее пространство arrow

-
-
-
+
+
+
Ваше имя
-
+
Ваш e-mail { type="email" />
-
+
Придумайте пароль
-
+
Повторите пароль
-
+
-
+
img

Создавайте и редактируйте задачи и проекты вместе с другими @@ -70,7 +70,7 @@ export const TrackerRegistration = () => {

img diff --git a/src/pages/TrackerRegistration/trackerRegistration.scss b/src/pages/TrackerRegistration/trackerRegistration.scss index e3d72bd0..12eb2d12 100644 --- a/src/pages/TrackerRegistration/trackerRegistration.scss +++ b/src/pages/TrackerRegistration/trackerRegistration.scss @@ -1,4 +1,4 @@ -.trackerRegistration { +.tracker-registration { &__content { font-family: "LabGrotesque", sans-serif; background-color: #f1f1f1; @@ -19,7 +19,7 @@ position: relative; border-radius: 12px; background: #FFF; - padding: 59px 115px 70px 102px; + padding: 20px; @media (max-width: 1000px) { display: flex; @@ -31,16 +31,11 @@ display: flex; flex-wrap: wrap; max-width: 650px; - row-gap: 25px; column-gap: 44px; @media (max-width: 1000px) { order: 2; } - - @media (max-width: 6755px) { - margin-bottom: 35px; - } } &__submit {