Compare commits

..

No commits in common. "30c316a335ad4035b3ad7e3ed4881a3e4fa27d7a" and "ee509a075484a566fa3f113e122014c6dc6c1417" have entirely different histories.

13 changed files with 30 additions and 66 deletions

View File

@ -1,7 +1,6 @@
.free-dev { .free-dev {
display: flex; overflow: hidden;
flex-direction: column; position: relative;
min-height: 100vh;
background-color: #f1f1f1; background-color: #f1f1f1;
.link { .link {
@ -29,11 +28,7 @@
} }
&_page { &_page {
display: flex; margin: 24px 0 30px 0;
flex-direction: column;
flex: 1;
color: #000000;
padding: 50px 0 0;
} }
&__title { &__title {

View File

@ -35,7 +35,7 @@ import arrow from "assets/icons/arrows/arrowCalendar.png";
import arrowStart from "assets/icons/arrows/arrowStart.png"; import arrowStart from "assets/icons/arrows/arrowStart.png";
import arrowDown from "assets/icons/arrows/selectArrow.png"; import arrowDown from "assets/icons/arrows/selectArrow.png";
import calendarIcon from "assets/icons/calendar.svg"; import calendarIcon from "assets/icons/calendar.svg";
import close from "assets/icons/crossWhite.svg"; import close from "assets/icons/close.png";
import fileDelete from "assets/icons/closeProjectPersons.svg"; import fileDelete from "assets/icons/closeProjectPersons.svg";
import del from "assets/icons/delete.svg"; import del from "assets/icons/delete.svg";
import edit from "assets/icons/edit.svg"; import edit from "assets/icons/edit.svg";
@ -971,7 +971,7 @@ export const TicketFullScreen = () => {
/> />
</div> </div>
<div className="time"> <div className="time">
<p></p> <img src={watch}></img>
<p> <p>
{correctTimerTime(currentTimerCount.hours)}: {correctTimerTime(currentTimerCount.hours)}:
{correctTimerTime(currentTimerCount.minute)}: {correctTimerTime(currentTimerCount.minute)}:

View File

@ -49,6 +49,8 @@
.fullscreen-workers { .fullscreen-workers {
@media (max-width: 880px) { @media (max-width: 880px) {
background: #dff1ff;
.workers_box { .workers_box {
@media (max-width: 880px) { @media (max-width: 880px) {
flex-direction: inherit !important; flex-direction: inherit !important;

View File

@ -286,15 +286,15 @@ export const ProfileCalendarComponent = React.memo(
? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}` ? `${getCorrectDate(startDate)} - ${getCorrectDate(endDate)}`
: `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}` : `${getCorrectDate(endDate)} - ${getCorrectDate(startDate)}`
: activePeriod : activePeriod
? "Выберите диапазон на календаре" ? "Выберите диапазон на календаре"
: "Выбрать диапазон"} : "Выбрать диапазон"}
</span> </span>
<span> <span>
{totalRangeHours {totalRangeHours
? `${totalRangeHours} ${hourOfNum(totalRangeHours)}` ? `${totalRangeHours} ${hourOfNum(totalRangeHours)}`
: endDate : endDate
? "0 часов" ? "0 часов"
: ""} : ""}
</span> </span>
{endDate && ( {endDate && (
<BaseButton <BaseButton

View File

@ -17,7 +17,7 @@
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 100%; height: 100%;
z-index: 9; z-index: 9999;
max-width: 1160px; max-width: 1160px;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;

View File

@ -145,10 +145,9 @@ const CatalogSpecialists = () => {
} }
]; ];
return ( return (
<div className="catalog-specialists"> <section className="catalog-specialists">
<AuthHeader /> <AuthHeader />
<SideBar /> <div className="container catalog-specialists__wrapper">
<div className="catalog-specialists__content container">
<ProfileBreadcrumbs <ProfileBreadcrumbs
links={[ links={[
{ name: "Главная", link: "/auth" }, { name: "Главная", link: "/auth" },
@ -202,8 +201,9 @@ const CatalogSpecialists = () => {
})} })}
</div> </div>
</div> </div>
<SideBar />
<Footer /> <Footer />
</div> </section>
); );
}; };

View File

@ -4,20 +4,8 @@
flex-direction: column; flex-direction: column;
min-height: 100vh; min-height: 100vh;
&__content { &__wrapper {
display: flex; padding-top: 24px;
flex-direction: column;
flex: 1;
color: #000000;
padding: 50px 0 0;
@media (max-width: 1375px) {
padding-top: 100px;
}
@media (max-width: 1000px) {
background-color: white;
}
} }
&__head { &__head {

View File

@ -1,15 +1,7 @@
.company-info { .company-info {
display: flex;
flex-direction: column;
min-height: 100vh;
background-color: #f1f1f1;
&__content { &__content {
display: flex; background-color: #f1f1f1;
flex-direction: column; padding-top: 60px;
flex: 1;
color: #000000;
padding: 50px 0 0;
@media (max-width: 1375px) { @media (max-width: 1375px) {
padding-top: 120px; padding-top: 120px;

View File

@ -83,7 +83,8 @@ export const FrequentlyAskedQuestions = () => {
<div className="frequently-asked-questions"> <div className="frequently-asked-questions">
<AuthHeader /> <AuthHeader />
<SideBar /> <SideBar />
<div className="container">
<div className="frequently-asked-questions__container container">
<ProfileBreadcrumbs <ProfileBreadcrumbs
links={[ links={[
{ name: "Главная", link: "/auth" }, { name: "Главная", link: "/auth" },

View File

@ -8,12 +8,9 @@
margin-top: 80px; margin-top: 80px;
} }
.container { &__container {
display: flex; flex: 1 1 auto;
flex-direction: column; margin: 30px 0;
flex: 1;
max-width: 1160px;
margin-top: 23px;
} }
&__about { &__about {

View File

@ -1,15 +1,9 @@
.registration-setting { .registration-setting {
display: flex;
flex-direction: column;
min-height: 100vh;
background-color: #f1f1f1;
&__content { &__content {
display: flex; background-color: #f1f1f1;
flex-direction: column;
flex: 1;
color: #000000; color: #000000;
padding: 50px 0 0; padding: 50px 0 0;
min-height: 100vh;
@media (max-width: 1375px) { @media (max-width: 1375px) {
padding-top: 100px; padding-top: 100px;

View File

@ -8,6 +8,7 @@
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
color: #000000; color: #000000;
padding: 50px 0 0; padding: 50px 0 0;

View File

@ -1,15 +1,9 @@
.tracker-registration { .tracker-registration {
display: flex;
flex-direction: column;
min-height: 100vh;
background-color: #f1f1f1;
&__content { &__content {
display: flex; background-color: #f1f1f1;
flex-direction: column;
flex: 1;
color: #000000; color: #000000;
padding: 50px 0 0; padding: 50px 0 0;
min-height: 100vh;
@media (max-width: 1375px) { @media (max-width: 1375px) {
padding-top: 100px; padding-top: 100px;