Skip to content
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.

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

Ticket-105 #383

Merged
merged 31 commits into from
Jul 25, 2024
Merged

Ticket-105 #383

merged 31 commits into from
Jul 25, 2024

Conversation

divitcr7
Copy link
Contributor

Switched to a new branch had issues because the file i was working on had additional codes added to main & that led to merge conflicts, took all the feedback in & fixed it

divitcr7 added 4 commits July 12, 2024 18:39
…ts because the file i was working on had additional codes added, took all teh feedback & fixed it
…ts because the file i was working on had additional codes added, took all teh feedback & fixed it
@divitcr7 divitcr7 requested a review from chrisbendel July 13, 2024 22:46
@chrisbendel
Copy link
Collaborator

Does this mean we should close #378 ? Let me know - we should try to clean this up cause it's a little confusing seeing two PRs for the same issue

frontend/src/components/footer.tsx Outdated Show resolved Hide resolved
frontend/src/components/footer.tsx Outdated Show resolved Hide resolved
frontend/src/components/footer.tsx Outdated Show resolved Hide resolved
frontend/src/components/navbar/top-navbar.tsx Outdated Show resolved Hide resolved
@Coder-Srinivas
Copy link
Contributor

The New Tag should be removed from studies and introducted to the learning path.

@chrisbendel
Copy link
Collaborator

@divitcr7 can you update the pull request title and description to give a more accurate depiction of what this pull request is doing? thanks!

@divitcr7
Copy link
Contributor Author

divitcr7 commented Jul 22, 2024

@Coder-Srinivas
Copy link
Contributor

For the color to appear for filled icons, it needs to be styled using the color tag inside the style prop, instead of the color prop. <IconCircleArrowUpFilled size='1.5rem' style={{ color: colors.purple }}/>

The Button Tag can be removed and the Icon can directly handle the onClick event.

frontend/yarn.lock Outdated Show resolved Hide resolved
@Coder-Srinivas
Copy link
Contributor

Coder-Srinivas commented Jul 23, 2024

Screenshot 2024-07-22 at 11 45 24 PM There may be an issue with the navigation bar on other pages, as the padding between the highlighted line and the navbar is small. Also, it can be furthur simplied by using border-bottom instead of :after

Resolved

frontend/yarn.lock Outdated Show resolved Hide resolved
/>
)
}

export const StudiesTitle: FC<{search: string, filteredStudies: ParticipantStudy[]}> = () => {
return (
<Title order={2} id='all-studies-unique-id'>All Studies</Title>
<Title order={2} id='all-studies-unique-id' style={{ paddingLeft: '2.5rem',paddingRight: '2.5rem' }}>View All Studies</Title>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can use px prop here

Copy link
Collaborator

@chrisbendel chrisbendel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can probably merge this since Iris is eagerly awaiting these changes. There are some things we should come back to in terms of cleaning up inline styles, using mantine props where possible (instead of writing our own CSS) and being consistent about trying to use mantine's sizes (ie xs, sm, md, lg, xl) instead of hardcoding X.Y rem units

@divitcr7 divitcr7 merged commit c4eacd3 into main Jul 25, 2024
4 checks passed
@divitcr7 divitcr7 deleted the Ticket-105-New-Branch branch July 25, 2024 01:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants