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

Merge pull request #150 from apuc/fixed-pages

Browse Source 
Fixed pages
This commit is contained in:
MaxOvs19 2023-11-17 17:22:25 +03:00 committed by GitHub
commit ecfb59e4e7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 160 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,7 @@ import arrowDown from "assets/icons/arrows/selectArrow.png";
import calendarIcon from "assets/icons/calendar.svg";
import category from "assets/icons/category.svg";
import close from "assets/icons/closeProjectPersons.svg";
import crossWhite from "assets/icons/crossWhite.svg";
import del from "assets/icons/delete.svg";
import edit from "assets/icons/edit.svg";
import file from "assets/icons/fileModal.svg";
@ -908,7 +909,7 @@ export const ModalTiсket = ({
)}
</div>
<div className="workers_box-bottom">
<div className="workers_box-tag">
<div className="tags">
<div className="tags__selected">
{taskTags.map((tag) => {
@ -920,7 +921,7 @@ export const ModalTiсket = ({
>
<p>{tag.slug}</p>
<img
src={close}
src={crossWhite}
className="delete"
alt="delete"
onClick={() => deleteTagFromTask(tag.id)}
@ -942,12 +943,12 @@ export const ModalTiсket = ({
</div>
{selectTagsOpen && (
<div className="tags__dropDown">
<img
{/* <img
onClick={() => setSelectTagsOpen(false)}
className="tags__dropDown__close"
src={close}
alt="close"
/>
/> */}
{correctProjectTags.map((tag) => {
return (
<div
@ -966,6 +967,8 @@ export const ModalTiсket = ({
</div>
)}
</div>
</div>
<div className="workers_box-bottom">
<div
className={editOpen ? "edit" : ""}
onClick={() => {

264
src/components/Modal/Tracker/ModalTicket/modalTicket.scss
View File

@ -20,9 +20,8 @@
border-radius: 8px;
display: flex;
flex-direction: row;
max-height: 650px;
overflow-y: auto;
max-height: 700px;
// overflow-y: auto;
@media (max-width: 880px) {
max-height: none;
@ -56,7 +55,7 @@
display: flex;
align-items: center;
flex-direction: row;
color: #1458DD;
color: #1458dd;
font-weight: 700;
font-size: 22px;
@ -157,6 +156,8 @@
.comments__list {
display: flex;
overflow-y: auto;
height: 190px;
flex-direction: column;
&::-webkit-scrollbar {
@ -974,6 +975,138 @@
border-bottom: 1px solid #f1f1f1;
}
&-tag {
.tags {
display: flex;
flex-direction: column;
position: relative;
row-gap: 15px;
padding: 22px 40px 0 40px;
border-radius: 10px;
margin-bottom: 10px;
&__selected {
display: flex;
flex-wrap: wrap;
padding: 0;
width: 100%;
gap: 8px;
max-width: 200px;
&__item {
display: flex;
padding: 8px 12px;
border-radius: 35px;
align-items: center;
column-gap: 8px;
cursor: default;
p {
color: #fff;
font-size: 12px;
font-style: normal;
font-weight: 500;
text-decoration: none !important;
margin: 0;
}
.delete {
cursor: pointer;
width: 12px;
height: 12px;
}
}
}
&__select {
cursor: pointer;
width: 100%;
height: 42px;
border-radius: 8px;
background: #ddd;
padding: 8px 12px 9px 12px;
display: flex;
justify-content: space-between;
align-items: center;
span {
font-size: 14px;
color: black;
}
img {
transition: all 0.3s ease;
}
.open {
transform: rotate(180deg);
}
}
&__dropDown {
position: absolute;
padding: 15px 9px 10px;
background: #ebebeb;
max-height: 350px;
overflow-y: auto;
width: 258px;
border-radius: 8px;
border: 1px solid #e4e4e4;
top: 105%;
display: flex;
flex-direction: column;
align-items: center;
row-gap: 6px;
z-index: 10;
&__close {
width: 8px;
height: 8px;
position: absolute;
right: 8px;
top: 5px;
}
.tagItem {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
height: 42px;
cursor: pointer;
column-gap: 8px;
padding: 5px;
border-radius: 8px;
background: #fff;
p {
font-size: 18px;
font-weight: 500;
margin: 0;
line-height: 20px;
text-decoration: none;
}
span {
width: 23px;
height: 23px;
border-radius: 8px;
}
}
&__noItem {
line-height: 20px;
font-size: 15px;
margin: 0;
font-weight: 500;
text-decoration: none !important;
cursor: default;
}
}
}
}
&-bottom {
padding: 10px 110px 15px 56px;
font-weight: 400;
@ -995,129 +1128,6 @@
}
}
.tags {
display: flex;
flex-direction: column;
position: relative;
row-gap: 5px;
padding: 5px;
border-radius: 10px;
border: 1px solid #e0e0e0;
margin-bottom: 10px;
&__selected {
display: flex;
flex-wrap: wrap;
padding: 0;
width: 100%;
gap: 8px;
max-width: 200px;
&__item {
display: flex;
padding: 3px 5px 3px 8px;
border-radius: 8px;
align-items: center;
column-gap: 8px;
cursor: default;
p {
font-weight: 600;
text-decoration: none !important;
font-size: 15px;
margin: 0;
line-height: 15px;
color: white;
}
.delete {
cursor: pointer;
width: 12px;
height: 12px;
}
}
}
&__select {
width: 100%;
height: 25px;
border-radius: 8px;
border: 1px solid gray;
padding: 5px 8px;
display: flex;
justify-content: space-between;
span {
font-size: 14px;
color: black;
}
img {
transition: all 0.3s ease;
}
.open {
transform: rotate(180deg);
}
}
&__dropDown {
position: absolute;
padding: 15px 10px 10px;
background: white;
width: 100%;
border-radius: 8px;
border: 1px solid #e4e4e4;
top: 110%;
display: flex;
flex-direction: column;
row-gap: 4px;
z-index: 10;
&__close {
width: 8px;
height: 8px;
position: absolute;
right: 8px;
top: 5px;
}
.tagItem {
display: flex;
width: 100%;
cursor: pointer;
column-gap: 8px;
padding: 5px;
border: 1px solid #ececec;
border-radius: 8px;
justify-content: space-between;
p {
font-size: 18px;
font-weight: 500;
margin: 0;
line-height: 20px;
text-decoration: none;
}
span {
width: 18px;
height: 18px;
border-radius: 50px;
}
}
&__noItem {
line-height: 20px;
font-size: 15px;
margin: 0;
font-weight: 500;
text-decoration: none !important;
cursor: default;
}
}
}
.edit {
background: #52b709;
border-radius: 50px;

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

@ -243,7 +243,7 @@
&__dropDown {
max-height: 155px;
overflow-y: hidden;
overflow-y: auto;
display: flex;
flex-direction: column;
position: absolute;
@ -265,6 +265,21 @@
}
}
}
&::-webkit-scrollbar {
width: 3px;
border-radius: 10px;
}
&::-webkit-scrollbar-thumb {
background: #cbd9f9;
border-radius: 20px;
}
&::-webkit-scrollbar-track {
background: #c5c0c6;
border-radius: 20px;
}
}
@media (max-width: 500px) {