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

Merge branch 'main' of https://git.itguild.info/apuc/guild_front

Browse Source 
debag-conflict
This commit is contained in:
Никита Губарь
2024-02-09 18:27:43 +03:00
parent af07631abe ab90e59880
commit e1516910ee
34 changed files with 371 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/Tracker/Tracker.jsx
View File

@ -33,7 +33,7 @@ import project from "assets/icons/trackerProject.svg";
import tasks from "assets/icons/trackerTasks.svg";
import archive from "assets/images/archiveIcon.png";
import mockAvatar from "assets/images/avatarMok.png";
import downloadExel from "assets/images/downloadExel.svg";
import downloadExcel from "assets/images/downloadExcel.svg";
import noProjects from "assets/images/noProjects.png";
import statusTimeTask from "assets/images/statusTimeTask.svg";
@ -305,8 +305,8 @@ export const Tracker = () => {
<p>Сверка пройдена</p>
</div>
<div>
<img src={downloadExel} alt="#" />
<p>Скачать Exel отчет</p>
<img src={downloadExcel} alt="#" />
<p>Скачать Excel-отчет</p>
</div>
</div>
</div>

21
src/pages/Tracker/tracker.scss
View File

@ -43,7 +43,7 @@
max-width: 1160px;
width: 100%;
background: #e1fccf;
border-radius: 12px;
border-radius: 12px 12px 0 0;
margin: 0 auto;
position: relative;
height: 60px;
@ -124,8 +124,7 @@
&__content {
width: 100%;
background: #ffffff;
padding: 30px 0;
margin-bottom: 10px;
padding: 20px 0;
&__wrapper {
max-width: 1160px;
@ -354,7 +353,7 @@
border: 1px solid #e3e2e2;
padding: 2px 6px;
position: relative;
max-width: 220px;
max-width: 190px;
width: 100%;
@media (max-width: 915px) {
@ -830,9 +829,7 @@
max-height: 100px;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-box-orient: vertical;
}
span {
@ -868,6 +865,7 @@
column-gap: 10px;
align-items: center;
pointer-events: none;
margin-top: 5px;
&__more {
cursor: pointer;
@ -898,7 +896,7 @@
display: flex;
align-items: center;
column-gap: 5px;
margin-bottom: 8px;
margin-top: 3px;
p {
font-weight: 500;
@ -927,7 +925,6 @@
display: flex;
align-items: center;
column-gap: 5px;
margin-bottom: 8px;
p {
font-weight: 500;
@ -939,12 +936,16 @@
font-weight: 500;
font-size: 14px;
}
img {
margin-top: -2px;
width: 18px;
}
}
&__executor {
display: flex;
align-items: center;
margin-top: 2px;
font-size: 14px;
font-weight: 500;
column-gap: 5px;
@ -967,7 +968,7 @@
flex-wrap: wrap;
column-gap: 6px;
row-gap: 3px;
margin: 5px 0 8px;
margin: 3px 0;
.tag-item {
padding: 3px 10px;