Compare commits

..

No commits in common. "50504109cbbb6cb84aec69b07d4bbcca11d5b48b" and "6086026617a68df51bd23314f345125dab1db790" have entirely different histories.

5 changed files with 64 additions and 29 deletions

View File

@ -174,7 +174,7 @@ const Candidate = () => {
<div className="candidate__works works"> <div className="candidate__works works">
<div className="works__body"> <div className="works__body">
<div className="works__body__info"> <div className="works__body__info">
<p>Портфолио разработчика</p> <p>Страница портфолио кода разработчика</p>
</div> </div>
<div className="works__item item-works"> <div className="works__item item-works">
<Link to="/" className="item-works__body"> <Link to="/" className="item-works__body">

View File

@ -153,7 +153,7 @@ export const ModalRegistration = ({ active, setActive }) => {
value={inputsValue.email} value={inputsValue.email}
placeholder="Почта" placeholder="Почта"
/> />
{inputsError.email && <span>Введите корректный e-mail</span>} {inputsError.email && <span>Введите корректный email</span>}
</div> </div>
</div> </div>

View File

@ -125,8 +125,8 @@ const ReportForm = () => {
<ProfileBreadcrumbs <ProfileBreadcrumbs
links={[ links={[
{ name: "Главная", link: "/profile" }, { name: "Главная", link: "/profile" },
{ name: "Отчеты", link: "/profile/calendar" }, { name: "Ваша отчетность", link: "/profile/calendar" },
{ name: "Добавить отчет", link: "/report" }, { name: "Страница добавления нового отчета", link: "/report" },
]} ]}
/> />
<h2 className="summary__title"> <h2 className="summary__title">

View File

@ -97,7 +97,7 @@ export const PartnerSettings = () => {
<div className="partner-settings__login"> <div className="partner-settings__login">
<h3 className="settings__title">Вход в систему</h3> <h3 className="settings__title">Вход в систему</h3>
<p className="settings__label">Изменение логина</p> <p className="settings__lable-first">Изменение логина</p>
<div className="settings__input"> <div className="settings__input">
<input <input
className={inputsError.name ? "warning" : ""} className={inputsError.name ? "warning" : ""}
@ -119,7 +119,7 @@ export const PartnerSettings = () => {
)} )}
</div> </div>
<p className="settings__label">Изменение пароля</p> <p className="settings__lable-second">Изменение пароля</p>
<div className="settings__input oldPassword"> <div className="settings__input oldPassword">
<input <input
className={inputsError.password ? "warning" : ""} className={inputsError.password ? "warning" : ""}
@ -185,26 +185,28 @@ export const PartnerSettings = () => {
</div> </div>
<div className="partner-settings__report"> <div className="partner-settings__report">
<h3 className="settings__title">Документы и отчеты</h3> <h3 className="settings__title">Документы и отчеты</h3>
<p className="settings__label">Изменить провадера ЭДО</p> <p className="settings__lable-first">Изменить провадера ЭДО</p>
<div className="partner-settings__logo"> <div className="partner-settings__logo">
<div> <div>
<label className="partner-settings__label"> <label className="partner-settings__label-first">
<img src={astral}></img> <img src={astral}></img>
<input type="checkbox" /> <input type="checkbox" />
<span className="checkbox"></span> <span className="checkbox__first"></span>
</label> </label>
</div> </div>
<div> <div>
<label className="partner-settings__label"> <label className="partner-settings__label-second">
<img src={kontur}></img> <img src={kontur}></img>
<input type="checkbox" /> <input type="checkbox" />
<span className="checkbox"></span> <span className="checkbox__second"></span>
</label> </label>
</div> </div>
</div> </div>
<p className="settings__label">Изменение названия компании</p> <p className="settings__lable-second">
Изменение названия компании
</p>
<div className="settings__input"> <div className="settings__input">
<input></input> <input></input>
</div> </div>

View File

@ -22,11 +22,20 @@
line-height: 24px; line-height: 24px;
} }
&__label { &__lable {
font-size: 15px; &-first,
line-height: 18px; &-second {
color: #000000; font-size: 15px;
margin: 15px 0 10px 0; line-height: 18px;
color: #000000;
}
&-first {
margin: 39px 0 10px 0;
}
&-second {
margin: 15px 0 10px 0;
}
} }
&__input { &__input {
@ -37,6 +46,7 @@
padding: 5px 10px; padding: 5px 10px;
background: #eff2f7; background: #eff2f7;
border-radius: 8px; border-radius: 8px;
width: 373px;
height: 35px; height: 35px;
border: none; border: none;
font-size: 15px; font-size: 15px;
@ -65,12 +75,11 @@
} }
&__buttons { &__buttons {
width: 100%; width: 87%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: flex-start; justify-content: space-between;
gap: 20px; margin: 36px 0 30px 0;
margin: 30px 0 20px;
&-cancel, &-cancel,
&-save { &-save {
@ -104,7 +113,7 @@
} }
} }
@media (max-width: 800px) { @media (max-width: 570px) {
&__input { &__input {
width: 95%; width: 95%;
} }
@ -114,7 +123,6 @@
width: 100%; width: 100%;
flex-direction: column-reverse; flex-direction: column-reverse;
align-items: center; align-items: center;
gap: 0px;
&-save { &-save {
margin-bottom: 15px; margin-bottom: 15px;
@ -124,7 +132,13 @@
} }
.checkbox { .checkbox {
margin: 0px 0 0 20px; &__first {
margin: 0px 0 0 20px;
}
&__second {
margin: 0px 20px 0 0;
}
} }
.partner-settings { .partner-settings {
@ -133,7 +147,7 @@
&__body { &__body {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: space-around; justify-content: space-between;
margin-top: 27px; margin-top: 27px;
} }
@ -183,8 +197,15 @@
} }
&__label { &__label {
display: flex; &-first,
align-items: center; &-second {
display: flex;
align-items: center;
}
&-second {
flex-direction: row-reverse;
}
} }
@media (max-width: 1200px) { @media (max-width: 1200px) {
@ -206,7 +227,10 @@
} }
&__label { &__label {
flex-direction: row; &-second,
&-first {
flex-direction: row;
}
} }
} }
@ -252,7 +276,16 @@
} }
&__label { &__label {
flex-direction: row; &-second,
&-first {
flex-direction: row;
}
}
.checkbox {
&__second {
margin: 0px 0 0 20px;
}
} }
} }
} }