diff --git a/src/components/AuthBox/authBox.scss b/src/components/AuthBox/authBox.scss index c90c55fa..739ca575 100644 --- a/src/components/AuthBox/authBox.scss +++ b/src/components/AuthBox/authBox.scss @@ -150,11 +150,11 @@ width: 268px; height: 75px; border-radius: 38px; - background-color: #ffffff; + background-color: #f5f5f5; border: 2px solid #6aaf5c; font-family: "Muller"; font-size: 2em; - font-weight: 300; + font-weight: 400; letter-spacing: normal; line-height: 71.88px; text-align: center; diff --git a/src/components/AuthHeader/AuthHeader.js b/src/components/AuthHeader/AuthHeader.js index aa8a342c..8f1c65d3 100644 --- a/src/components/AuthHeader/AuthHeader.js +++ b/src/components/AuthHeader/AuthHeader.js @@ -8,7 +8,9 @@ export const AuthHeader = ({}) => { return (
-

itguild.

+

+ itguild.аутстафинг ИТ специалистов +

diff --git a/src/components/AuthHeader/authHeader.scss b/src/components/AuthHeader/authHeader.scss index 6cef0a80..1447a2b9 100644 --- a/src/components/AuthHeader/authHeader.scss +++ b/src/components/AuthHeader/authHeader.scss @@ -12,6 +12,9 @@ line-height: 32px; color: #000000; } + span { + color: #52b709; + } } &__navigation { diff --git a/src/components/SliderWorkers/sliderWorkers.scss b/src/components/SliderWorkers/sliderWorkers.scss index 46efcdd4..75dc79a7 100644 --- a/src/components/SliderWorkers/sliderWorkers.scss +++ b/src/components/SliderWorkers/sliderWorkers.scss @@ -46,14 +46,16 @@ margin-left: 15px; img { - margin-right: 33px; + margin-right: 20px; + width: 100px; + height: 100px; } p { font-size: 15px; line-height: 22px; color: black; - width: 198px; + width: 160px; } &__resume { @@ -66,40 +68,54 @@ line-height: 32px; color: white; border: none; + transition: 0.5s; + + &:hover { + transition: 0.5s; + background-color: #52b709a8; + } } } .slick-next { + display: flex !important; + align-items: center; + justify-content: center; background-color: #8dc63f; width: 44px; height: 44px; border-radius: 44px; &:before { - content: ">"; - color: white; - font-size: 23px; + content: url("../../images/arrowViewReport.svg"); + } + + &:focus { + background-color: #8dc63f; } - &:focus, &:hover { background-color: #8ec63f91; } } .slick-prev { + display: flex !important; + align-items: center; + justify-content: center; background-color: #8dc63f; width: 44px; height: 44px; border-radius: 44px; &:before { - content: "<"; - color: white; - font-size: 23px; + content: url("../../images/ArrovLeftSlider.png"); + } + + &:focus { + background-color: #8dc63f; } - &:focus, &:hover { background-color: #8ec63f91; } @@ -136,7 +152,7 @@ text-align: center; } - .worker-description { + &-description { display: flex; flex-direction: column; align-items: center; diff --git a/src/components/UI/ModalTiket/ModalTiket.js b/src/components/UI/ModalTiket/ModalTiket.js index 46bd6f1a..6b74aed0 100644 --- a/src/components/UI/ModalTiket/ModalTiket.js +++ b/src/components/UI/ModalTiket/ModalTiket.js @@ -40,14 +40,6 @@ export const ModalTiket = ({ active, setActive }) => { className="modal-tiket__content" onClick={(e) => e.stopPropagation()} > -
- - - - - - -

@@ -75,6 +67,7 @@ export const ModalTiket = ({ active, setActive }) => {

+ setActive(false)}> {tiket.code}

Создатель : {tiket.creator}

diff --git a/src/components/UI/ModalTiket/ModalTiket.scss b/src/components/UI/ModalTiket/ModalTiket.scss index a2c74a53..36aaf5c8 100644 --- a/src/components/UI/ModalTiket/ModalTiket.scss +++ b/src/components/UI/ModalTiket/ModalTiket.scss @@ -23,20 +23,6 @@ display: flex; flex-direction: row; - .author { - padding: 25px 0 0 0; - border-radius: 8px 0 0 8px; - display: flex; - flex-direction: column; - align-items: center; - width: 76px; - background: #fbfbfb; - - a { - margin-bottom: 16px; - } - } - .content { display: flex; flex-direction: column; @@ -109,10 +95,34 @@ } .workers { + position: relative; border-left: 1px solid #f1f1f1; width: 300px; padding: 40px; + .exit { + cursor: pointer; + position: absolute; + top: 22px; + right: 31px; + + &:before, + &:after { + content: ""; + position: absolute; + width: 16px; + height: 2px; + background: #263238; + } + + &:before { + transform: rotate(45deg); + } + &:after { + transform: rotate(-45deg); + } + } + span { font-family: "Inter", sans-serif; font-weight: 500; @@ -149,6 +159,7 @@ } .start { + font-size: 12px; margin-top: 25px; width: 151px; height: 40px; diff --git a/src/images/ArrovLeftSlider.png b/src/images/ArrovLeftSlider.png new file mode 100644 index 00000000..f1489058 Binary files /dev/null and b/src/images/ArrovLeftSlider.png differ diff --git a/src/pages/AuthForDevelopers/authForDevelopers.scss b/src/pages/AuthForDevelopers/authForDevelopers.scss index 5cf8aa60..25b5d894 100644 --- a/src/pages/AuthForDevelopers/authForDevelopers.scss +++ b/src/pages/AuthForDevelopers/authForDevelopers.scss @@ -1,4 +1,5 @@ .auth-developers { + font-family: "LabGrotesque", sans-serif; overflow: hidden; position: relative; @@ -200,7 +201,7 @@ &__partnersForDev { background: #52b7098c; color: #2d6505; - margin-left: -40px; + margin-left: -35px; } &__partnersForDev, diff --git a/src/pages/AuthForPartners/authForPartners.scss b/src/pages/AuthForPartners/authForPartners.scss index a34b5bf7..acee7572 100644 --- a/src/pages/AuthForPartners/authForPartners.scss +++ b/src/pages/AuthForPartners/authForPartners.scss @@ -1,4 +1,5 @@ .auth-partners { + font-family: "LabGrotesque", sans-serif; overflow: hidden; position: relative; @@ -302,7 +303,7 @@ &__partnersForPart { background: #406128; color: white; - margin-left: -40px; + margin-left: -35px; } &__partnersForPart, diff --git a/src/pages/PartnerSettings/PartnerSettings.js b/src/pages/PartnerSettings/PartnerSettings.js index eb8b4066..f83882cd 100644 --- a/src/pages/PartnerSettings/PartnerSettings.js +++ b/src/pages/PartnerSettings/PartnerSettings.js @@ -16,7 +16,7 @@ export const PartnerSettings = () => {