Skip to content

Manage the styling of banner of both task update and standup update #648

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
ankushdharkar merged 3 commits into from
Jun 25, 2023
Merged

Manage the styling of banner of both task update and standup update #648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39d0993
fixed banner styling of task progress and standup
Pratiyushkumar Jun 21, 2023
6d4dd01
Wrote test caes for standup Feature
Pratiyushkumar Jun 22, 2023
1221e4b
reverting changes
Pratiyushkumar Jun 22, 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
10 changes: 0 additions & 10 deletions src/components/ProgressForm/ProgressForm.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,6 @@ $similar-margin: $base-unit * 8;
$section-padding-top-bottom: $base-unit * 30;
$section-padding-left-right: $base-unit * 25;

.banner {
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: center;
width: 100%;
margin-top: $diff-margin;
margin-left: 8.2rem;
}

.mark {
color: $color-red;
text-decoration: underline;
Expand Down
24 changes: 13 additions & 11 deletions src/components/ProgressForm/ProgressHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,19 @@ const ProgressHeader: FC<progressHeaderProps> = ({
updateType,
}) => {
return (
<div className={styles.progressBanner}>
<p className={styles.bannerPara}>
You have
<span className={styles.totalMissedUpdates}>
{totalMissedUpdates} missed
</span>
{updateType} updates
</p>
<p className={styles.bannerPara}>
Let&apos;s try to avoid having zero days
</p>
<div className={styles.bannerContainer}>
<div className={styles.progressBanner}>
<p className={styles.bannerPara}>
You have
<span className={styles.totalMissedUpdates}>
{totalMissedUpdates} missed
</span>
{updateType} updates
</p>
<p className={styles.bannerPara}>
Let&apos;s try to avoid having zero days
</p>
</div>
</div>
);
};
Expand Down
10 changes: 4 additions & 6 deletions src/components/ProgressForm/ProgressLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ const ProgressLayout: FC = () => {
return (
<>
<NavBar />
<div className={styles.banner}>
<ProgressHeader
totalMissedUpdates={totalMissedUpdates}
updateType="Progress"
/>
</div>
<ProgressHeader
totalMissedUpdates={totalMissedUpdates}
updateType="Progress"
/>
<section className={styles.container}>
<h1 className={styles.formHeading}>Task Updates</h1>
<h2 className={styles.date}>On {getCurrentDate()}</h2>
Expand Down
9 changes: 4 additions & 5 deletions src/components/standup/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,11 @@ const StandUpContainer: FC = () => {
return (
<>
<section className="container">
<ProgressHeader
totalMissedUpdates={totalMissedUpdates}
updateType="Standup"
/>
<div className={styles.standupContainer}>
<ProgressHeader
totalMissedUpdates={totalMissedUpdates}
updateType="Standup"
/>

<div className={styles.standupUpdateContainer}>
<h1 className={styles.standupTitle}>Standup Update</h1>
<form
Expand Down
13 changes: 11 additions & 2 deletions src/components/standup/standupContainer.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ $radius: 0.5rem;
.standupContainer {
display: flex;
flex-direction: column;
margin-top: 1.8rem;
width: 100%;
align-items: center;
justify-content: center;
Expand All @@ -27,6 +26,16 @@ $radius: 0.5rem;
border-radius: $radius;
}

.bannerContainer {
display: flex;
flex-direction: column;
align-items: flex-start;
justify-content: center;
width: 100%;
margin-top: 2rem;
margin-left: 8.2rem;
}

.bannerPara {
font-family: 'Poppins', sans-serif;
font-size: 1.2rem;
Expand All @@ -41,7 +50,7 @@ $radius: 0.5rem;

.standupUpdateContainer {
width: 50%;
margin-top: 4rem;
margin-top: 2rem;
}

.standupForm {
Expand Down