apuc/guild_front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #148 from apuc/fixed-pages

Browse Source 
Fixed page tracker
This commit is contained in:
MaxOvs19 2023-11-09 21:05:55 +03:00 committed by GitHub
commit 82973a2582
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 58 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/assets/icons/crossWhite.svg Normal file
View File

@ -0,0 +1,10 @@
<svg width="7" height="6" viewBox="0 0 7 6" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_1895_1196)">
<path d="M1.05915 4.7073e-05C1.1835 -0.00182845 1.25965 0.0525618 1.33035 0.123644C1.98754 0.782517 2.64585 1.44026 3.30378 2.09839C3.36443 2.15903 3.42482 2.15909 3.48496 2.09857C4.12958 1.45377 4.7742 0.808962 5.419 0.164343C5.59024 -0.00670482 5.74591 -0.00576705 5.92052 0.165844C6.03193 0.275375 6.14371 0.38453 6.25436 0.494624C6.41491 0.654606 6.41585 0.820965 6.25436 0.982823C5.59887 1.63926 4.94337 2.29532 4.28562 2.94931C4.23179 3.00295 4.22767 3.02977 4.2845 3.08623C4.93887 3.7346 5.59005 4.38634 6.24217 5.03696C6.42129 5.2157 6.42072 5.37062 6.24086 5.55067C6.13039 5.66114 6.02067 5.77217 5.90964 5.88208C5.75116 6.03868 5.58611 6.03868 5.42838 5.88114C4.77213 5.22564 4.11551 4.57071 3.46208 3.9124C3.40506 3.85501 3.37937 3.86063 3.32591 3.91465C2.67848 4.56583 2.02842 5.21439 1.37874 5.86351C1.19719 6.04487 1.0449 6.04525 0.865035 5.86576C0.75888 5.75979 0.652725 5.65382 0.546945 5.54767C0.370833 5.37118 0.369708 5.21476 0.543945 5.03959C1.19363 4.38691 1.84294 3.73347 2.49506 3.08304C2.54982 3.02846 2.55245 3.00183 2.49693 2.9465C1.83224 2.28613 1.17056 1.62294 0.508122 0.960317C0.331822 0.784018 0.330697 0.627036 0.504371 0.453175C0.621404 0.335954 0.739187 0.219671 0.855657 0.102076C0.917362 0.0394332 0.990133 0.00304792 1.05915 4.7073e-05Z" fill="white"/>
</g>
<defs>
<clipPath id="clip0_1895_1196">
<rect width="6.00113" height="6" fill="white" transform="translate(0.375)"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

2
src/components/Modal/Tracker/ModalTicket/ModalTicket.jsx
View File

@ -933,7 +933,7 @@ export const ModalTiсket = ({
className="tags__select" className="tags__select"
onClick={() => setSelectTagsOpen(!selectTagsOpen)} onClick={() => setSelectTagsOpen(!selectTagsOpen)}
> >
<span>Выберете тег</span> <span>Выберите тег</span>
<img <img
className={selectTagsOpen ? "open" : ""} className={selectTagsOpen ? "open" : ""}
src={arrowDown} src={arrowDown}

3
src/components/Modal/Tracker/TrackerModal/TrackerModal.jsx
View File

@ -37,6 +37,7 @@ import arrowRight from "assets/icons/arrows/arrowRightCreateTask.svg";
import arrowDown from "assets/icons/arrows/selectArrow.png"; import arrowDown from "assets/icons/arrows/selectArrow.png";
import close from "assets/icons/close.png"; import close from "assets/icons/close.png";
import calendarImg from "assets/icons/createTaskCalendar.svg"; import calendarImg from "assets/icons/createTaskCalendar.svg";
import crossWhite from "assets/icons/crossWhite.svg";
import avatarMok from "assets/images/avatarMok.png"; import avatarMok from "assets/images/avatarMok.png";
import "./trackerModal.scss"; import "./trackerModal.scss";
@ -497,7 +498,7 @@ export const TrackerModal = ({
> >
<p>{tag.slug}</p> <p>{tag.slug}</p>
<img <img
src={close} src={crossWhite}
className="delete" className="delete"
alt="delete" alt="delete"
onClick={() => onClick={() =>

76
src/components/Modal/Tracker/TrackerModal/trackerModal.scss
View File

@ -162,7 +162,7 @@
&__dropDown { &__dropDown {
position: absolute; position: absolute;
background: #F1F1F1; background: #f1f1f1;
border-radius: 8px; border-radius: 8px;
top: 55px; top: 55px;
left: 0; left: 0;
@ -242,6 +242,8 @@
} }
&__dropDown { &__dropDown {
max-height: 155px;
overflow-y: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
position: absolute; position: absolute;
@ -282,7 +284,7 @@
display: flex; display: flex;
column-gap: 9.5px; column-gap: 9.5px;
align-items: center; align-items: center;
background: #F1F1F1; background: #f1f1f1;
border-radius: 22px 22px 0 0; border-radius: 22px 22px 0 0;
span { span {
@ -297,10 +299,10 @@
span { span {
padding: 3.75px 16.25px 5.75px; padding: 3.75px 16.25px 5.75px;
color: #FFFFFF; color: #ffffff;
font-size: 12px; font-size: 12px;
font-weight: 500; font-weight: 500;
background: #52B709; background: #52b709;
border-radius: 12px; border-radius: 12px;
} }
} }
@ -322,13 +324,13 @@
} }
.input-container { .input-container {
background: #F1F1F1; background: #f1f1f1;
margin: 0 0 17px; margin: 0 0 17px;
width: 393px; width: 393px;
height: 47px; height: 47px;
input { input {
background: #F1F1F1; background: #f1f1f1;
color: #000000; color: #000000;
font-size: 15px; font-size: 15px;
line-height: 18px; line-height: 18px;
@ -337,7 +339,7 @@
} }
.ck-editor { .ck-editor {
border: 1px solid #DDDDDD; border: 1px solid #dddddd;
border-radius: 8px; border-radius: 8px;
} }
@ -358,7 +360,7 @@
align-items: center; align-items: center;
column-gap: 9.5px; column-gap: 9.5px;
p { p {
color: #2D4A17; color: #2d4a17;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
line-height: 32px; line-height: 32px;
@ -388,11 +390,17 @@
row-gap: 8px; row-gap: 8px;
&__name { &__name {
color: #000;
font-size: 15px;
font-weight: 400;
line-height: normal;
cursor: pointer; cursor: pointer;
display: flex; display: flex;
align-items: center;
justify-content: space-between; justify-content: space-between;
padding: 5px; padding: 9.5px 12px;
border-radius: 8px; border-radius: 8px;
height: 47px;
border: 1px solid #e4e4e4; border: 1px solid #e4e4e4;
img { img {
@ -414,17 +422,18 @@
.selectedTag { .selectedTag {
display: flex; display: flex;
padding: 3px 5px 3px 8px; padding: 7px 7px 7px 8px;
border-radius: 8px; border-radius: 35px;
align-items: center; align-items: center;
column-gap: 8px; column-gap: 8px;
p { p {
font-weight: 600; color: #fff;
font-size: 15px; font-size: 13px;
font-style: normal;
font-weight: 500;
line-height: 0px;
margin: 0; margin: 0;
line-height: 15px;
color: white;
} }
.delete { .delete {
@ -445,41 +454,46 @@
border: 1px solid #e4e4e4; border: 1px solid #e4e4e4;
top: 90%; top: 90%;
z-index: 101; z-index: 101;
padding: 20px 10px 10px; padding: 30px 10px 10px;
background: white; background: #ebebeb;
row-gap: 8px; row-gap: 8px;
.close { .close {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
width: 20px; width: 22px;
height: 20px; height: 22px;
right: 5px; right: 9px;
top: 0; top: 4px;
} }
.tag__item { .tag__item {
display: flex; display: flex;
align-items: center;
height: 42px;
background: white;
width: 100%; width: 100%;
cursor: pointer; cursor: pointer;
column-gap: 8px; column-gap: 8px;
padding: 5px; padding: 9px 14px;
border: 1px solid #ececec; border: 1px solid #ececec;
border-radius: 8px; border-radius: 8px;
justify-content: space-between; justify-content: space-between;
p { p {
font-size: 18px; color: #000;
font-weight: 500; font-size: 14px;
font-style: normal;
font-weight: 300;
line-height: 0px;
margin: 0; margin: 0;
line-height: 20px;
text-decoration: none; text-decoration: none;
} }
span { span {
width: 18px; width: 22px;
height: 18px; height: 23px;
border-radius: 50px; border-radius: 8px;
} }
} }
@ -492,7 +506,7 @@
} }
.select__executor { .select__executor {
background: #F1F1F1; background: #f1f1f1;
width: 393px; width: 393px;
height: 47px; height: 47px;
font-weight: 300; font-weight: 300;
@ -506,7 +520,7 @@
margin: 0; margin: 0;
width: 185px; width: 185px;
height: 42px; height: 42px;
color: #FFFFFF; color: #ffffff;
font-weight: 500; font-weight: 500;
font-size: 16px; font-size: 16px;
} }
@ -522,7 +536,7 @@
margin-bottom: 22px; margin-bottom: 22px;
span { span {
color: #6F6F6F; color: #6f6f6f;
} }
p { p {