Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

0.17 into develop #12964

Merged
merged 10 commits into from
Dec 19, 2024
Merged

0.17 into develop #12964

merged 10 commits into from
Dec 19, 2024

Conversation

rtibbles
Copy link
Member

@rtibbles rtibbles commented Dec 19, 2024

Summary

Cascade merge

# Conflicts:
#	kolibri/__init__.py
#	packages/kolibri/styles/internal/themeSpec.js

Note that I also had to update two JS import paths for the core JS API.

nucleogenesis and others added 10 commits December 11, 2024 14:57
- NavBar & NavbarLink now take & drill a `textColor` prop
- In AppBar, the new token `appBarText` is passed to `textColor`
- In AppBar, it is also used as the default color for icons, the page title, and the user's info

This is done to permit plugins to customize the text in the AppBar so that they can ensure proper contrast with their chosen `appBar` token's value, which is used as the background.
…ens-appBarText-for-is

AppBar: Use appBarText for text/icon colors
# Conflicts:
#	kolibri/__init__.py
#	packages/kolibri/styles/internal/themeSpec.js
@rtibbles rtibbles merged commit 49555de into learningequality:develop Dec 19, 2024
37 checks passed
@rtibbles rtibbles deleted the 017intodevelop branch December 19, 2024 19:04
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants