Skip to content

Refactoring the task editing popup #578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
winterlena wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Refactoring the task editing popup #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98d8df7
Refactoring the task editing popup
winterlena Dec 16, 2024
140910d
edit style, tsx, remove wrappers
AlexandraSukhova Dec 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/app/assets/styles/common.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@ h6 {

* {
box-sizing: border-box;
margin: 0;
padding: 0;
}

.border {
Expand Down
211 changes: 93 additions & 118 deletions src/features/create-request/ui/steps/common-step/common-step.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,52 @@
.mainWrapper {
position: relative;
top: -8px;
display: grid;
grid-template-rows: 1fr min-content;
grid-template-columns: 52px 1fr;
grid-template-areas:
'. content'
'. button';
row-gap: 40px;
column-gap: 20px;
margin-top: 40px;
}
.container {
margin: 50px 0 0 76px;

.content {
grid-area: content;
display: flex;
flex-direction: column;
width: 450px;
min-height: 150px;
row-gap: 20px;
}

.buttonsWrapper {
.content__item_wrapper {
display: flex;
justify-content: flex-end;
margin-top: 45px;
flex-direction: row;
gap: 5px;
justify-content: space-between;
}

.prevButton {
margin-right: 20px;
.content__item_description {
display: grid;
row-gap: 5px;
grid-template-areas:
'category category'
'description description'
'moreButton .'
'. editButton';
grid-template-rows: min-content 1fr repeat(2, min-content);
grid-template-columns: 1fr min-content;
}

.addressWrapper {
.buttonsWrapper {
grid-area: button;
display: flex;
margin-top: 20px;
}

.address {
max-width: 269px;
}

.typeOfTask {
margin: 15px 0 0;
justify-content: flex-end;
gap: 10px;
}

.descriptionForTask {
height: auto;
max-height: 64px;
grid-area: description;
width: 454px;
height: 65px;
transition: max-height 0.3s ease;
overflow: hidden;
display: -webkit-box;
Expand All @@ -45,7 +56,7 @@
}

.descriptionForTask.expanded {
max-height: min-content;
height: min-content;
resize: none;
transition: var(--transition-hover);
box-sizing: border-box;
Expand All @@ -66,120 +77,84 @@
-webkit-line-clamp: unset;
}

.dateWrapper {
.readMoreButton {
grid-area: moreButton;
justify-self: start;
background: none;
border: none;
color: var(--colors-interface-primary);
cursor: pointer;
align-self: flex-start;
}

.content__item_description .editButton {
grid-area: editButton;
white-space: nowrap;
}

.category {
grid-area: category;
}

.addressOutput {
display: flex;
column-gap: 20px;
align-items: center;
gap: 5px;
max-width: 300px;
}

.categories {
padding: 7px 2px 5px 10px;
margin-top: 20px;
.addressOutput svg {
flex-shrink: 0;
}

.dateAndTime {
display: flex;
gap: 30px;
}

@media (max-width: 735px) {
.container {
align-items: flex-start;
margin: 3px 0 0 0;
width: 270px;
height: 300px;
}
.mainWrapper {
display: flex;
flex-direction: column;
align-items: center;
margin-top: 0;
grid-template-rows: min-content 1fr min-content;
grid-template-columns: 1fr;
grid-template-areas:
'title'
'content'
'button';
justify-items: center;
height: 550px;
row-gap: 30px;
}
.buttonsWrapper {
gap: 10px;
margin-top: 80px;
justify-content: center;
width: 260px;
position: relative;
bottom: -140px;
}
.task {
align-self: center;
position: relative;
bottom: -10px;

.content__item_wrapper {
flex-direction: column;
}

.headerWrapper {
background: linear-gradient(
90deg,
rgba(255, 255, 255, 0) 0%,
var(--colors-interface-primary) 49.28%,
rgba(255, 255, 255, 0) 100%
);
.title__mobile {
grid-area: title;
width: 240px;
height: 1px;
margin-top: 4px;
align-self: center;
position: relative;
bottom: -10px;
text-align: center;
}

.dateWrapper {
margin: 40px 0 0;
position: relative;
column-gap: 45px;
.gradient {
position: absolute;
bottom: -4px;
}

.addressWrapper {
position: relative;
margin-top: 17px;
left: -4px;
}
.typeOfTask {
margin-top: 5px;
margin-bottom: 10px;
.content__item_description {
grid-template-areas:
'category category'
'description description'
'moreButton .'
'editButton .';
}

.descriptionForTask {
height: auto;
overflow: hidden;
text-overflow: ellipsis;
max-height: 64px;
max-width: 250px;
transition: max-height 0.3s ease;
display: -webkit-box;
-webkit-line-clamp: 4;
-webkit-box-orient: vertical;
overflow-wrap: anywhere;
}

.descriptionForTask.expanded {
min-height: 185px;
-webkit-line-clamp: unset;
text-align: start;
appearance: auto;
-webkit-rtl-ordering: logical;
cursor: text;
overflow-wrap: break-word;
background-color: field;
width: 100%;
}

.categories {
width: 250px;
margin-top: 17px;
margin-bottom: 13px;
}

.prevButton {
margin-right: 0;
.buttonsWrapper {
align-self: flex-end;
}
}
.edit_button {
padding-left: 10px;
padding-bottom: 0;
display: flex;
align-items: flex-end;
}

.readMoreButton {
background: none;
border: none;
color: var(--colors-interface-primary);
cursor: pointer;
padding: 0;
align-self: flex-start;
margin-top: 5px;
}
Loading