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

calendar menu: make weather optional #253

Merged
merged 6 commits into from
Oct 3, 2024

Conversation

j-brn
Copy link
Contributor

@j-brn j-brn commented Sep 11, 2024

Adds a setting to enable or disable the weather widget in the calendar menu.
Since the weather widget requires additional setup to function, the default is off.

image
image

adds a setting to enable or disable the weather widget in the calendar
menu.
modules/menus/calendar/index.ts Outdated Show resolved Hide resolved
@Jas-SinghFSU
Copy link
Owner

Jas-SinghFSU commented Sep 16, 2024

@j-brn There are merge conflicts in this file due to a huge linting and formatting PR.

I have gone ahead and created a branch that you should be able to merge into yours to resolve the conflicts.

When you get a chance, feel free to merge with rebase/253.

@j-brn j-brn force-pushed the optional_weather branch 2 times, most recently from 87d2804 to 6db64c3 Compare September 23, 2024 19:55
@j-brn
Copy link
Contributor Author

j-brn commented Sep 23, 2024

@j-brn There are merge conflicts in this file due to a huge linting and formatting PR.

I have gone ahead and created a branch that you should be able to merge into yours to resolve the conflicts.

When you get a chance, feel free to merge with rebase/253.

@Jas-SinghFSU rebased from master

@Jas-SinghFSU
Copy link
Owner

@j-brn Could you merge with rebase/253 please? It includes some styling fixes like the extra padding below the calendar when weather is disabled.

@j-brn
Copy link
Contributor Author

j-brn commented Sep 30, 2024

@j-brn Could you merge with rebase/253 please? It includes some styling fixes like the extra padding below the calendar when weather is disabled.

@Jas-SinghFSU done

@Jas-SinghFSU Jas-SinghFSU merged commit fe53b3e into Jas-SinghFSU:master Oct 3, 2024
1 check passed
@Jas-SinghFSU
Copy link
Owner

Looks good! Thanks for the contribution fam!

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.

2 participants