From 2b65b4249466978c56d40b856e3a202b26a4b9fa Mon Sep 17 00:00:00 2001 From: M1kola Date: Mon, 10 Apr 2023 18:12:36 +0300 Subject: [PATCH] fixes --- src/components/Candidate/Candidate.js | 2 +- src/components/Candidate/candidate.scss | 128 ++++++++++-------- .../StepsForCandidate/stepForCandidate.scss | 9 ++ .../AuthForCandidate/authForCandidate.scss | 40 ++++++ .../AuthForPartners/authForPartners.scss | 4 + src/pages/PartnerBid/PartnerBid.js | 2 +- .../registationForCandidate.scss | 4 + 7 files changed, 131 insertions(+), 58 deletions(-) diff --git a/src/components/Candidate/Candidate.js b/src/components/Candidate/Candidate.js index fe960887..807bb89e 100644 --- a/src/components/Candidate/Candidate.js +++ b/src/components/Candidate/Candidate.js @@ -104,7 +104,7 @@ const Candidate = () => {
-

{currentCandidateObj.specification}{SKILLS[currentCandidateObj.position_id]} {LEVELS[currentCandidateObj.level]}

+

{currentCandidateObj.specification}   {SKILLS[currentCandidateObj.position_id]}   {LEVELS[currentCandidateObj.level]}

navigate('/profile/catalog')}>
diff --git a/src/components/Candidate/candidate.scss b/src/components/Candidate/candidate.scss index 413a9006..d4edea1c 100644 --- a/src/components/Candidate/candidate.scss +++ b/src/components/Candidate/candidate.scss @@ -56,6 +56,10 @@ font-style: normal; letter-spacing: normal; text-align: left; + + @media (max-width: 1200px) { + margin: 0; + } } &-secondary { @@ -78,6 +82,10 @@ img { position: absolute; + + @media (max-width: 768px) { + position: initial; + } } h3 { @@ -116,6 +124,10 @@ font-size: 12px; color: #5B6871; max-width: 75px; + + @media (max-width: 768px) { + max-width: 100%; + } } } @@ -124,40 +136,40 @@ } } -@media (max-width: 575.98px) { - .candidate { - &__title { - h2 { - font-size: 5em; - line-height: normal; - } - } - - &__arrow { - margin-bottom: 40px; - - &-img { - img { - cursor: pointer; - } - } - - &-sp { - span { - margin-left: 40px; - margin-right: 120px; - font-family: 'GT Eesti Pro Display', sans-serif; - font-size: 1.8em; - font-weight: 100; - font-style: normal; - letter-spacing: normal; - line-height: 36px; - text-align: left; - } - } - } - } -} +//@media (max-width: 575.98px) { +// .candidate { +// &__title { +// h2 { +// font-size: 5em; +// line-height: normal; +// } +// } +// +// &__arrow { +// margin-bottom: 40px; +// +// &-img { +// img { +// cursor: pointer; +// } +// } +// +// &-sp { +// span { +// margin-left: 40px; +// margin-right: 120px; +// font-family: 'GT Eesti Pro Display', sans-serif; +// font-size: 1.8em; +// font-weight: 100; +// font-style: normal; +// letter-spacing: normal; +// line-height: 36px; +// text-align: left; +// } +// } +// } +// } +//} @media (max-width: 375.98px) { .candidate { @@ -177,7 +189,6 @@ } &__arrow { - margin-left: 60px; margin-bottom: 40px; } } @@ -185,28 +196,28 @@ @media (max-width: 575.98px) { .candidate { - &__header { - display: flex; - flex-direction: column; - margin-left: 0; - margin-top: 40px; - } + //&__header { + // display: flex; + // flex-direction: column; + // margin-left: 0; + // margin-top: 40px; + //} - &__main { - &-description { - h2 { - font-size: 3.2em; - text-align: center; - position: absolute; - top: -410px; - left: 0; - } - - img { - display: none; - } - } - } + //&__main { + // &-description { + // h2 { + // font-size: 3.2em; + // text-align: center; + // position: absolute; + // top: -410px; + // left: 0; + // } + // + // img { + // display: none; + // } + // } + //} &__btn { display: block; @@ -313,6 +324,11 @@ column-gap: 10px; row-gap: 15px; + @media (max-width: 1200px) { + margin-top: 20px; + padding: 0 15px; + } + &__info { width: 100%; background: #E1FCCF; diff --git a/src/components/StepsForCandidate/stepForCandidate.scss b/src/components/StepsForCandidate/stepForCandidate.scss index 165953d8..1e703639 100644 --- a/src/components/StepsForCandidate/stepForCandidate.scss +++ b/src/components/StepsForCandidate/stepForCandidate.scss @@ -7,6 +7,11 @@ padding:0 55px 0 85px; width: 100%; + @media (max-width: 965px) { + justify-content: center; + padding: 0 20px; + } + &__start { display: flex; align-items: center; @@ -26,6 +31,10 @@ line-height: 32px; color: #000000; } + + @media (max-width: 965px) { + display: none; + } } &__info { diff --git a/src/pages/AuthForCandidate/authForCandidate.scss b/src/pages/AuthForCandidate/authForCandidate.scss index 2b648202..e6932d20 100644 --- a/src/pages/AuthForCandidate/authForCandidate.scss +++ b/src/pages/AuthForCandidate/authForCandidate.scss @@ -11,6 +11,15 @@ padding: 50px 0 35px 56px; margin-top: 40px; display: flex; + + @media (max-width: 1024px) { + margin-top: 100px; + } + + @media (max-width: 870px) { + flex-direction: column; + padding: 25px; + } } &__info { @@ -28,6 +37,15 @@ font-weight: 400; font-size: 16px; line-height: 30px; + + @media (max-width: 870px) { + max-width: none; + margin-bottom: 15px; + } + } + + @media (max-width: 870px) { + margin-right: 0; } } @@ -47,6 +65,10 @@ font-weight: 400; font-size: 15px; line-height: 18px; + + @media (max-width: 870px) { + max-width: 350px; + } } label { @@ -87,6 +109,10 @@ span { color: #52B709; } + + @media (max-width: 660px) { + font-size: 25px; + } } &__description { @@ -103,6 +129,20 @@ row-gap: 24px; column-gap: 21px; width: 100%; + + .categoriesItem { + @media (max-width: 1094px) { + flex: 0 0 48.6%; + } + + @media (max-width: 795px) { + flex: 0 0 100%; + } + } + + @media (max-width: 660px) { + margin-top: 130px; + } } } diff --git a/src/pages/AuthForPartners/authForPartners.scss b/src/pages/AuthForPartners/authForPartners.scss index 11929021..427ff6cc 100644 --- a/src/pages/AuthForPartners/authForPartners.scss +++ b/src/pages/AuthForPartners/authForPartners.scss @@ -300,6 +300,10 @@ img { transform: rotate(90deg); } + + @media (max-width: 660px) { + margin: 15px 0; + } } &__partnersForPart { diff --git a/src/pages/PartnerBid/PartnerBid.js b/src/pages/PartnerBid/PartnerBid.js index 674fb549..49d3c1dc 100644 --- a/src/pages/PartnerBid/PartnerBid.js +++ b/src/pages/PartnerBid/PartnerBid.js @@ -116,7 +116,7 @@ export const PartnerBid = () => { return avatar

{person.name}

- + Подробнее
diff --git a/src/pages/RegistrationForCandidate/registationForCandidate.scss b/src/pages/RegistrationForCandidate/registationForCandidate.scss index 17a7a0f7..a7da8f34 100644 --- a/src/pages/RegistrationForCandidate/registationForCandidate.scss +++ b/src/pages/RegistrationForCandidate/registationForCandidate.scss @@ -10,6 +10,10 @@ align-items: center; margin-top: 55px; + @media (max-width: 1024px) { + padding-top: 70px; + } + .step { top: 36.5%; }