Compare commits

...

4 Commits

Author SHA1 Message Date
Victor Batischev
30c316a335 fix modal z-index 2024-02-15 17:04:30 +03:00
Victor Batischev
9a1ffb3c77 fix layout 2024-02-15 17:04:01 +03:00
Victor Batischev
1ddaf1d405 fix 2024-02-15 17:02:16 +03:00
Victor Batischev
35ad3086ba layout style fix 2024-02-15 17:01:50 +03:00
13 changed files with 66 additions and 30 deletions

View File

@ -1,6 +1,7 @@
.free-dev { .free-dev {
overflow: hidden; display: flex;
position: relative; flex-direction: column;
min-height: 100vh;
background-color: #f1f1f1; background-color: #f1f1f1;
.link { .link {
@ -28,7 +29,11 @@
} }
&_page { &_page {
margin: 24px 0 30px 0; display: flex;
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/close.png"; import close from "assets/icons/crossWhite.svg";
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">
<img src={watch}></img> <p></p>
<p> <p>
{correctTimerTime(currentTimerCount.hours)}: {correctTimerTime(currentTimerCount.hours)}:
{correctTimerTime(currentTimerCount.minute)}: {correctTimerTime(currentTimerCount.minute)}:

View File

@ -49,8 +49,6 @@
.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: 9999; z-index: 9;
max-width: 1160px; max-width: 1160px;
width: 100%; width: 100%;
margin: 0 auto; margin: 0 auto;

View File

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

View File

@ -4,8 +4,20 @@
flex-direction: column; flex-direction: column;
min-height: 100vh; min-height: 100vh;
&__wrapper { &__content {
padding-top: 24px; display: flex;
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,7 +1,15 @@
.company-info { .company-info {
display: flex;
flex-direction: column;
min-height: 100vh;
background-color: #f1f1f1;
&__content { &__content {
background-color: #f1f1f1; display: flex;
padding-top: 60px; flex-direction: column;
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,8 +83,7 @@ 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,9 +8,12 @@
margin-top: 80px; margin-top: 80px;
} }
&__container { .container {
flex: 1 1 auto; display: flex;
margin: 30px 0; flex-direction: column;
flex: 1;
max-width: 1160px;
margin-top: 23px;
} }
&__about { &__about {

View File

@ -1,9 +1,15 @@
.registration-setting { .registration-setting {
display: flex;
flex-direction: column;
min-height: 100vh;
background-color: #f1f1f1;
&__content { &__content {
background-color: #f1f1f1; display: flex;
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,7 +8,6 @@
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,9 +1,15 @@
.tracker-registration { .tracker-registration {
display: flex;
flex-direction: column;
min-height: 100vh;
background-color: #f1f1f1;
&__content { &__content {
background-color: #f1f1f1; display: flex;
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;