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.

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

Jump to bottom

fix: place hours and courses under schedule name #388

Merged
merged 20 commits into from
Nov 22, 2024
Merged

fix: place hours and courses under schedule name #388

merged 20 commits into from
Nov 22, 2024

Conversation

warithr621
Copy link
Contributor

@warithr621 warithr621 commented Oct 23, 2024 •
edited
Loading

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
IsaDavRod
IsaDavRod approved these changes Oct 23, 2024
View reviewed changes
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 •
edited
Loading

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
@warithr621 warithr621 requested a review from IsaDavRod October 23, 2024 15:38
Razboy20
Razboy20 previously requested changes Oct 23, 2024
View reviewed changes
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
@Razboy20
Merge remote-tracking branch 'origin/main' into fix/align-schedule-hours
737d094
@warithr621
fix: new hour/course styling per discussion
312cc1e 
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 warithr621 requested a review from Razboy20 October 24, 2024 00:42
@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

IsaDavRod
IsaDavRod requested changes Nov 5, 2024
View reviewed changes
Copy link
Member

@IsaDavRod IsaDavRod left a comment •
edited by Samathingamajig
Loading

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)

@warithr621
fix: updated cal + popup style details
fa2eda8 
- 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
@warithr621 warithr621 requested a review from IsaDavRod November 5, 2024 19:47
@DereC4
Copy link
Member

DereC4 commented Nov 5, 2024

image
image

IsaDavRod
IsaDavRod approved these changes Nov 6, 2024
View reviewed changes
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
doprz
doprz approved these changes Nov 6, 2024
View reviewed changes
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

src/views/components/common/ScheduleDropdown.tsx Outdated Show resolved Hide resolved
@doprz doprz added the blocked Do not merge (yet) label Nov 6, 2024
IsaDavRod
IsaDavRod approved these changes Nov 6, 2024
View reviewed changes
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 dismissed Razboy20’s stale review November 7, 2024 16:01

Finalized design

@IsaDavRod IsaDavRod removed the blocked Do not merge (yet) label Nov 7, 2024
@Samathingamajig Samathingamajig self-requested a review November 12, 2024 00:31
Samathingamajig
Samathingamajig requested changes Nov 12, 2024
View reviewed changes
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/common/ScheduleTotalHoursAndCourses.tsx Outdated Show resolved Hide resolved
src/views/components/settings/Settings.tsx Outdated Show resolved Hide resolved
src/views/components/common/ScheduleTotalHoursAndCourses.tsx Outdated Show resolved Hide resolved
@Samathingamajig Samathingamajig force-pushed the fix/align-schedule-hours branch from 7ca1013 to c4f834d Compare November 12, 2024 06:46
@DereC4 DereC4 added this to the v2.1.0 milestone Nov 17, 2024
@DereC4 DereC4 added the bugfix label Nov 17, 2024
@DereC4 DereC4 requested review from IsaDavRod and doprz November 17, 2024 07:07
doprz
doprz requested changes Nov 20, 2024
View reviewed changes
src/views/components/PopupMain.tsx Outdated Show resolved Hide resolved
Samathingamajig
Samathingamajig approved these changes Nov 22, 2024
View reviewed changes
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

doprz
doprz approved these changes Nov 22, 2024
View reviewed changes
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

@Samathingamajig Samathingamajig merged commit 7dd9369 into Longhorn-Developers:main Nov 22, 2024
6 checks passed
@Samathingamajig Samathingamajig changed the title fix: bottom-aligned all calendar elements, updated calendar header & main popup layout fix: place hours and courses under schedule name Nov 22, 2024
@IsaDavRod IsaDavRod mentioned this pull request Nov 26, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Samathingamajig Samathingamajig Samathingamajig approved these changes

@doprz doprz doprz approved these changes

@Razboy20 Razboy20 Awaiting requested review from Razboy20

@IsaDavRod IsaDavRod Awaiting requested review from IsaDavRod

Assignees

@warithr621 warithr621

Labels
bugfix
Projects
None yet
Milestone
v2.1.0
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
@warithr621 @DereC4 @Samathingamajig @Razboy20 @IsaDavRod @doprz