Skip to content

Fix : inconsistency in the width of task-tabs and task-cards #655

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

Merged
sahsisunny merged 5 commits into from
Jun 27, 2023
Merged

Fix : inconsistency in the width of task-tabs and task-cards #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
673da2e
Fix : inconsistency in the width of task-tabs and task-cards
j24m Jun 23, 2023
d254f24
Fix : task-card responsive for tab view.
j24m Jun 25, 2023
19e4ded
Refactor
j24m Jun 25, 2023
74f1761
Refactor
j24m Jun 26, 2023
06ea306
Refactor
j24m Jun 27, 2023
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
9 changes: 5 additions & 4 deletions src/components/Header/Header.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
.header {
padding-top: 0.6rem;
display: flex;
justify-content: center;
align-items: center;
flex-wrap: wrap;
padding-top: 0.625rem;
align-items: center;
border-bottom: 1px solid var(--toastify-text-color-light);
}

.link {
padding: 0.625rem;
padding: 0.6rem;
text-decoration: none;
font-weight: bold;
font-weight: 700;
color: #041484;
cursor: pointer;
background: none;
Expand Down
29 changes: 21 additions & 8 deletions src/components/Tabs/Tabs.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,31 @@
$theme-grey: #d4d4d5;
$theme-grey-light: #f1f1f5;
$gray-shade-color: #808080;
$gray-shade-color2: #5c5b5b;

.tabButton {
background: white;
border: none;
padding: 12px 8px 8px;
font-size: 0.8em;
border-radius: 5px 5px 0 0;
border-bottom: 1px solid $theme-grey;
border-bottom: 1.8px solid $theme-grey;
font-size: 0.85rem;
font-weight: bold;
color: $gray-shade-color;
background: var(--toastify-color-light);
padding: 0.45rem 0.8rem;
border-radius: 0.2rem 0.2rem 0 0;
cursor: pointer;
}

.tabButton:hover {
color: $gray-shade-color2;
}

.tabButton:active {
background-color: $theme-grey-light;
}

.active {
font-weight: bold;
border: 1px solid $theme-grey;
color: var(--toastify-color-dark);
border: 1.8px solid $theme-grey;
border-bottom: none;
background: white;
background: var(--toastify-color-light);
}
4 changes: 2 additions & 2 deletions src/components/tasks/TaskList/TaskList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default function TaskList({
}

return (
<>
<div className={styles.taskCardsContainer}>
{filteredTasks.map((item: task) => (
<Card
content={item}
Expand All @@ -72,6 +72,6 @@ export default function TaskList({
{SEE_MORE}
</button>
)}
</>
</div>
);
}
10 changes: 9 additions & 1 deletion src/components/tasks/card/card.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ $seeMoreTasksShadow: #595959cc;
}

.card {
text-align: left;
display: flex;
flex-direction: column;
padding: 1rem;
Expand All @@ -35,7 +36,7 @@ $seeMoreTasksShadow: #595959cc;
justify-content: space-between;
border: 1px solid #d9d9d9;
position: relative;
max-width: 720px;
width: 50rem;

@media (max-width: 48rem) {
width: 100%;
Expand Down Expand Up @@ -303,3 +304,10 @@ $seeMoreTasksShadow: #595959cc;
transform: rotate(360deg);
}
}

.taskCardsContainer {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
6 changes: 6 additions & 0 deletions src/styles/tasks.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
.container {
text-align: center;
display: flex;
flex-direction: column;
margin: 0 auto;
Expand All @@ -25,5 +26,10 @@
}

.tabsContainer {
display: flex;
justify-content: center;
align-items: center;
padding: 1rem;
margin-bottom: 1rem;
flex-wrap: wrap;
}