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

fix: bottom-aligned all calendar elements, updated calendar header & main popup layout #388

Open
wants to merge 15 commits into
base: main
Choose a base branch
from

Conversation

warithr621
Copy link
Contributor

@warithr621 warithr621 commented Oct 23, 2024

Fixes #349

Before:
image
After:
image
New Popup Layout:
image

Changes:

  • Hours and Courses are now aligned with the schedule name by the baseline and not the midline
  • The spelling of Calendar is adjusted in one of the file names and all future calls in other files
  • UI modified to update layout in header and popup, including a line break in the calendar header and the introduction of smallcaps
  • When the window is shrunk horizontally, the hours and courses remain in view

This change is Reviewable

@warithr621 warithr621 marked this pull request as ready for review October 23, 2024 05:42
@IsaDavRod IsaDavRod self-requested a review October 23, 2024 05:44
Copy link
Member

@IsaDavRod IsaDavRod left a comment

Choose a reason for hiding this comment

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

LGTM

@warithr621 warithr621 marked this pull request as draft October 23, 2024 15:28
@warithr621
Copy link
Contributor Author

warithr621 commented Oct 23, 2024

Updated layout after changes:
image
lmk if there's any specifics y'all still want to update (e.g. spacing in the dropdown since I didn't look too much into that)

@warithr621 warithr621 marked this pull request as ready for review October 23, 2024 15:38
Copy link
Member

@Razboy20 Razboy20 left a comment

Choose a reason for hiding this comment

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

(blocking on discord suggestions/finalization)

Razboy20 and others added 2 commits October 23, 2024 14:49
i love having 80 different ideas, hopefully after this there's like maybe a tiny commit left to do before this is done..
@warithr621
Copy link
Contributor Author

After the 4th commit listed, here's what it looks like
image

@warithr621
Copy link
Contributor Author

I'm not confident about how this should look at all so pls feel free to look and figure out how I can fix what I differ with the Figma

image image

@warithr621
Copy link
Contributor Author

image
image

How it looks as of the 7th (..oops) commit

Copy link
Member

@IsaDavRod IsaDavRod left a comment

Choose a reason for hiding this comment

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

  • 1) Make sure the schedule title in calendar and main popup view is not allcaps
  • 2) Remove the colon after the schedule name in calendar and main popup view
  • 3) Hide the "LAST UDPATED ON..." in calendar and main popup view
  • 4) The # hours, # courses can be h3 instead of h4 just to make it a little better in calendar view only (keep as h4 in main popup view)

- schedule title is now in normal casing w/ colon removed
- last updated on is now entirely deleted from everywhere
- hour and course numbers now h3 in calendar ONLY
@DereC4
Copy link
Member

DereC4 commented Nov 5, 2024

image
image

Copy link
Member

@IsaDavRod IsaDavRod left a comment

Choose a reason for hiding this comment

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

LGTM

@doprz doprz self-requested a review November 6, 2024 00:39
@warithr621 warithr621 changed the title fix(header): bottom-aligned the schedule name + hours/courses in calendar fix: bottom-aligned all calendar elements, updated calendar header & main popup layout Nov 6, 2024
Copy link
Collaborator

@doprz doprz left a comment

Choose a reason for hiding this comment

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

LGTM

Comment on lines 52 to 57
<Text variant='h4' className='text-theme-black leading-[75%]!'>
{activeSchedule ? activeSchedule.courses.length : 0}
</Text>
<Text
variant='h4'
className='text-theme-black leading-[75%]!'
Copy link
Collaborator

Choose a reason for hiding this comment

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

Since we're using leading-[75%] various times, does it make sense to add to our theme config instead of having it as an arbitrary value?

@doprz doprz added the blocked Do not merge (yet) label Nov 6, 2024
Copy link
Member

@IsaDavRod IsaDavRod left a comment

Choose a reason for hiding this comment

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

LGTM

@IsaDavRod IsaDavRod removed the blocked Do not merge (yet) label Nov 7, 2024
Copy link
Collaborator

@Samathingamajig Samathingamajig left a comment

Choose a reason for hiding this comment

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

LGTM, small things requested. fix the merge conflicts too. if you need help, let us know

src/views/components/common/ScheduleDropdown.tsx Outdated Show resolved Hide resolved
src/views/components/common/ScheduleDropdown.tsx Outdated Show resolved Hide resolved
src/views/components/settings/Settings.tsx Outdated Show resolved Hide resolved
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.

Attempt to align-bottom the Schedule Name w/ Total Hours and Total Courses text
6 participants